| commit | 861fbd9365c9881e60504ce778231d2bd3d77185 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:04:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 15:04:04 2012 -0700 |
| tree | d5a35a61a9c2f80d349ecd835b70e002b6aa2d20 | |
| parent | a412dec5bbfe2af7c6d5ee2d9bee840e976daeee [diff] | |
| parent | a6db845d24104eca99a0174af9fcaa713e838517 [diff] |
am a6db845d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a6db845d24104eca99a0174af9fcaa713e838517': JOO31B JOO31