tree 640f655cd595f82ace4684488b369de235fb5ac8
parent a227332ec5b9a0f0b3aafdb43d73f161e8f2808b
parent 5b689625cf2aaefbdc4e56651c1f138be5417179
author The Android Open Source Project <initial-contribution@android.com> 1349275014 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349275014 -0700

am 5b689625: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5b689625cf2aaefbdc4e56651c1f138be5417179':