| commit | 9a51c30193e69a2986f8345cf554b765347c1673 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sat Sep 15 16:17:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 15 16:17:01 2012 -0700 |
| tree | e98a11812008c753ac2e01e84f3301967532d221 | |
| parent | 897d208207fef6dc1e419f8a4c4e6b6d32e6e47c [diff] | |
| parent | 50ba3615a4f8702b8d779dbaba90363e39f0a1be [diff] |
am 50ba3615: (-s ours) am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge * commit '50ba3615a4f8702b8d779dbaba90363e39f0a1be': JGO77 JGO76