| commit | a1c4f10f57dd968720148c78b4615cbf37bf7f67 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 13 11:29:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 13 11:29:04 2012 -0700 |
| tree | e98a11812008c753ac2e01e84f3301967532d221 | |
| parent | 01be4e6670eef141ed94baa61eb881df46cab66c [diff] | |
| parent | e4f72f8207b40e7b0b4e8b0d33514729ca016039 [diff] |
am e4f72f82: (-s ours) am fc9e3924: (-s ours) Reconcile with jb-nakasig-release - do not merge * commit 'e4f72f8207b40e7b0b4e8b0d33514729ca016039': JGO75 JGO74