commit | f0e3acd06af00c07bfb541090b5349618fa67507 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:38 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:38 2012 -0800 |
tree | 2c99308c800c64b395da698a4a6b8604e780d4b4 | |
parent | 13f460ba715c26096f168616ca4b449e4445403a [diff] | |
parent | 86ee26bf99d8937d6dfd3aaee7965368e1612a62 [diff] |
am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '78b012f5bc05706d1ce412811ccfaa9385dae0ab':