commit | 7b8eccfd128bee09c660e0e2110e43307189e2fa | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:12:39 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:12:39 2012 -0800 |
tree | 51bac729f7186c76f114019f891c6388dc2022b7 | |
parent | bc74447080e16c3171229231021ad5ee217b690c [diff] | |
parent | d3ef89148cde944aa1b02a2e8410168a9695e208 [diff] |
am d3ef8914: am a11e2d20: Reconcile with jb-mr1-release - do not merge * commit 'd3ef89148cde944aa1b02a2e8410168a9695e208':