| commit | 3fbe7bc5a57e425f6852e1e4bc860fbd47faeb1e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:52:44 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:52:44 2013 -0800 |
| tree | 3c2e48cf17d2c513e2cdb0a7ab46d2f46cae7db9 | |
| parent | c968999749e524a4beff985dca8c15ae2ecc6413 [diff] | |
| parent | 2f4e38f0621586ed3b53ed0ad1827bffe18a1ff9 [diff] |
am 2f4e38f0: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (1) and The Android Open Source Project (1) * commit '2f4e38f0621586ed3b53ed0ad1827bffe18a1ff9':