| commit | 2bd3f3dca1f2dac0d3d2788c6fa54e2eeb477e40 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:29:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:29:10 2012 -0800 |
| tree | 442d793ef58f5cd77b1c0d1db8a0b6804723ab0f | |
| parent | 2788a3526d7abb9afc64d10118a03734327a89e7 [diff] | |
| parent | 1509a46a860060f7630c5c58d7d08695f7350dc2 [diff] |
am 1509a46a: (-s ours) am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '1509a46a860060f7630c5c58d7d08695f7350dc2':