commit | c9b993620b5648dac65804cb6a314aad1d58432d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:33:50 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:33:50 2012 -0800 |
tree | 8040939b8202d2069ce58d6570b6beea6b063f4d | |
parent | b3a68f6e002cdbc946d08a76656067d63542a98a [diff] | |
parent | 29132ce84bcb3afe2253a9cc4022c0bb7d1f8a26 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Idb85365d68dc7637fb2efd3213eacb49c0e26785