| commit | 53e39eca5e8f2ac9042885bc35a9d0f06a841c5e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:42:33 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 15:42:33 2012 -0800 |
| tree | 79669efb7b2e79ac59781bc9bbdada562f559cbd | |
| parent | 01ccbe775b101e6e14c64da63564429b2f7ae12a [diff] | |
| parent | 1630826edbdf92a903a2f16693d12d4b02d17678 [diff] |
am 1630826e: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '1630826edbdf92a903a2f16693d12d4b02d17678': JDP60B JDP60