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