| commit | 8bb46bec8b798c9fb3ac5e906ec8c3b1fbccc853 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 18:59:00 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 18:59:00 2012 -0700 |
| tree | 87aad105d2d7b12f78d4502e50d8650afa1c4cbf | |
| parent | 77201b54149ff8d531eb15ac5bd8386b325974be [diff] | |
| parent | a4a9820f373792a760356ae19117f29ef7145352 [diff] |
am a4a9820f: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'a4a9820f373792a760356ae19117f29ef7145352':