tree fa6d8a45dbce130d3ea7f2349478998c7945a67b
parent 4ec4465e9ccfcc2ae868c268cd7cdf2d5f909518
parent 6b071c38cda21c679c18310a823c17dad32e8ea1
author The Android Open Source Project <initial-contribution@android.com> 1343429117 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343429117 -0700

am 6b071c38: Reconcile with jb-release

* commit '6b071c38cda21c679c18310a823c17dad32e8ea1':