| commit | 1ca4b7d26a46d7b779a687f43f2c30ea779693de | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:27:03 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:27:03 2012 -0800 |
| tree | 937f2e93af2489a618e686ef5cd29ffe1374b6cc | |
| parent | 493d04d2fec59b273a067f5ef9d908dd0b441a08 [diff] | |
| parent | 270ee0c6c62e1bcf278892094653e7ab008b3685 [diff] |
am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge * commit '270ee0c6c62e1bcf278892094653e7ab008b3685':