tree 7def88fdc3225d8e9dc16179d8ed366e4a4b8b6b
parent d9058a5a06800299e7173cfab7297358a578530e
parent 38beb75989f517071635750d26ae5b34ee8b4a84
author The Android Open Source Project <initial-contribution@android.com> 1342713148 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342713148 -0700

am 38beb759: Reconcile with jb-mr0-release

* commit '38beb75989f517071635750d26ae5b34ee8b4a84':