tree 62c2ce4f1f892cdb1750e703cafc1d51dc94d12e
parent bac65450c3de90ebeb1425147771d3b59e2de70d
parent 7a63def870ef9089c7ee28e839a80a6544830e11
author The Android Open Source Project <initial-contribution@android.com> 1352734450 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352734450 -0800

am 7a63def8: (-s ours) am 5ab56553: am f8fbfd9f: Reconcile with jb-mr1-release - do not merge

* commit '7a63def870ef9089c7ee28e839a80a6544830e11':