| commit | cbc0968f602c15692200c827fe78944d1f528654 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:43:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 12 07:43:43 2012 -0800 |
| tree | 8040939b8202d2069ce58d6570b6beea6b063f4d | |
| parent | c9b993620b5648dac65804cb6a314aad1d58432d [diff] | |
| parent | b3e8a615d0fdb18bd4d3ac76e72b3fceab590f17 [diff] |
am b3e8a615: am 16cb8655: Reconcile with jb-mr1-release - do not merge * commit 'b3e8a615d0fdb18bd4d3ac76e72b3fceab590f17': JOP40F