| commit | 50a2f4e1a9f0fff8fdb1e73759a757a1c543ec25 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:17:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:17:43 2012 -0800 |
| tree | fb90bdf484d931322c08707793da1131a96353f0 | |
| parent | e4dc139a2ede5f9f6cbdea2392c384846687debf [diff] | |
| parent | 7b8eccfd128bee09c660e0e2110e43307189e2fa [diff] |
am 7b8eccfd: (-s ours) am d3ef8914: am a11e2d20: Reconcile with jb-mr1-release - do not merge * commit '7b8eccfd128bee09c660e0e2110e43307189e2fa':