commit | b2c31c3ec814479bde1d0f7ed633653a8045a081 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 07 15:22:29 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 07 15:22:29 2012 -0700 |
tree | 8732801174a048218f79016e455ffb1efdeab309 | |
parent | 86eab5978362ba8c1ad7a436994a7f20c679b313 [diff] | |
parent | a7b0ec3c4892ae20a0726debc3f3642dbada7bc7 [diff] |
am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge * commit 'a7b0ec3c4892ae20a0726debc3f3642dbada7bc7': JRO03W JRO69 JGO69 JGO68 JGO67 JZO54E