| commit | 83ae5807e2a699ef1c84a2733e85cdf4f05807d8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:16 2012 -0700 |
| tree | c4a1e6e6451ac325008d6902a94bb1f44a8c77d1 | |
| parent | 8c60e0e3656b11554a7b857e42d9e5ee42fc6809 [diff] | |
| parent | 9e7f65fdc941f9e35faddc5d117bcb40aa91b09a [diff] |
am 9e7f65fd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9e7f65fdc941f9e35faddc5d117bcb40aa91b09a':