| commit | 37a13a9b82c1c0e18d5be3188e8e038f85477459 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:32 2012 -0700 |
| tree | 0cf2f809282d776c3c49c5a630da780dab6754a8 | |
| parent | b301817223d7163de6827976f8259363ab18c7b8 [diff] | |
| parent | b11ab8578b997a5d2bfc93b13c1c71396c60a03f [diff] |
am b11ab857: (-s ours) am 96b17f8e: am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'b11ab8578b997a5d2bfc93b13c1c71396c60a03f': JZO54I