| commit | a7abd9f829d1235b9101616b353611af0f77d416 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 20 16:46:50 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 20 16:46:50 2013 +0000 |
| tree | e2ef57975309685b7bc8125336818053ba37942f | |
| parent | 2ef5bf63e0510a6332c3d47d523e99c6425282e5 [diff] | |
| parent | 85e6a18aa8444becc41236841a10f92fca3f8443 [diff] |
am 85e6a18a: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '85e6a18aa8444becc41236841a10f92fca3f8443':