| commit | 1bf30069e9409c62868b7b17ce29b467a1d8cb2e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 22:48:37 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 22:48:37 2013 +0000 |
| tree | ae8156df3c8c9dddc0b60b9f32e1003306313722 | |
| parent | 88e237455d52998d08a989204c9cee0f3642f220 [diff] | |
| parent | 9ac0ad81235d0e3e4d0d7c6425878ec2e4f9847d [diff] |
am 9ac0ad81: (-s ours) am d1dd7fbb: am 80db4328: am ca849386: Reconcile with jb-mr1-release - do not merge * commit '9ac0ad81235d0e3e4d0d7c6425878ec2e4f9847d':