| commit | f30b22d3478f6af0237a63539a313fe3f2c20669 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:12 2012 -0700 |
| tree | 178854b2917d9d46c37533ad3066a1d53ff650dd | |
| parent | a4920fdb7aa51f502b7cfd56c50e7947e2cd8e8f [diff] | |
| parent | 5e6d24e84c7886ccbe345d501159d7e7b0ceb2fb [diff] |
am 5e6d24e8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5e6d24e84c7886ccbe345d501159d7e7b0ceb2fb':