commit | 4caf0ebebbdd7514f4c12ae14b4cc537d504f20e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:27:04 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:27:04 2012 -0800 |
tree | acfc8b558580f0421840af5f9e94b328e18c1a90 | |
parent | 20a08cc9916a2a65a557f533a6bdc2878b1bddef [diff] | |
parent | 188bd32cb36757ca2a007b66becdaf31abed41af [diff] |
am 188bd32c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '188bd32cb36757ca2a007b66becdaf31abed41af':