tree 7866c87916f727e8d3418ff2a08126cf0b65b84d
parent 54d1bf89b712f020d798ff99552a938411e3fee1
parent 1a4f71b2d49a2dc761188fa5b3bc3c07ad9220cc
author The Android Open Source Project <initial-contribution@android.com> 1341343041 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341343041 -0700

am 1a4f71b2: Reconcile with jb-release

* commit '1a4f71b2d49a2dc761188fa5b3bc3c07ad9220cc':