tree 235abd54f4c3c6ed2c6b59bbade55a6459f13ed8
parent c666cae2d5995097ec49a87e375e2afdd92802b7
parent 5e966ef64bda21a14b5f835040f515932c52e966
author The Android Open Source Project <initial-contribution@android.com> 1343429133 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343429133 -0700

am 5e966ef6: Reconcile with jb-release

* commit '5e966ef64bda21a14b5f835040f515932c52e966':