commit | deba21491ea1e727fa6b9ff44abc5060239707b4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Apr 02 11:04:14 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 02 11:04:14 2013 -0700 |
tree | 5acf1ffca86880504b18eb964ca4a7626aa29428 | |
parent | a4a1c1657799cb30d72af989de333c3e0130cbad [diff] | |
parent | 512382e404eb125d61725b25210c02abc73f6d62 [diff] |
am 512382e4: Reconcile with jb-mr2-release - do not merge * commit '512382e404eb125d61725b25210c02abc73f6d62':