| commit | 23167e7556391b666d5902ffe12766f53ac6a873 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 19:51:51 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 19:51:51 2013 +0000 |
| tree | 506ee663db657b015ee0ee0d97158bcf4c0a6bf5 | |
| parent | 3d0bf2b30ceae01e7c3e8f2d4cfcd9a1ea7be79d [diff] | |
| parent | 1467dfa5cd28b8b4e07cfe86b020a07bd0d0da24 [diff] |
am 1467dfa5: (-s ours) am a60f3818: am b2525ba8: am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1467dfa5cd28b8b4e07cfe86b020a07bd0d0da24':