| commit | 6c1c1326f2688fbbdffd07fe869df3b2d67f50fd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 17 14:43:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 17 14:43:45 2012 -0700 |
| tree | db29654dc0bc276a062d9b32c90fe66c9d2e3271 | |
| parent | f5a44d0f4f788659bccd534b0679f32601ecf3c8 [diff] | |
| parent | 5660cfe1d48306bdcba10b4989a720fd247fa828 [diff] |
am 5660cfe1: (-s ours) am 50ba3615: am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge * commit '5660cfe1d48306bdcba10b4989a720fd247fa828': JGO77 JGO76