| commit | 4f5f408b912ee3e39f31e7e2c558dd6bc5701204 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:29 2013 -0700 |
| tree | 3d7b9f6ac5ad0ef0605fc64c439e37c53e395982 | |
| parent | 02317798dec329868318e75a83c7c654cf5200b3 [diff] | |
| parent | 62752611e864f14768615e0b22184feb66993e78 [diff] |
am 62752611: am 1954242c: am 83e25988: (-s ours) am 294cefd4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '62752611e864f14768615e0b22184feb66993e78':