| commit | 373539079494574def2754ba42bf012e8cdc14ca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:31:45 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:31:45 2012 -0800 |
| tree | 9d6eabf858ce5044e73f138902cfc857511c6ef0 | |
| parent | 01e774de6dcbfc9bcefefffab4eb1adc027446ae [diff] | |
| parent | 77d6e5f7bfd34f92f8f53297bf2c97fe6fd986f9 [diff] |
am 77d6e5f7: (-s ours) am c66e994c: am b791a5fb: Reconcile with jb-mr1-release - do not merge * commit '77d6e5f7bfd34f92f8f53297bf2c97fe6fd986f9': JOP37B