tree 966a2f02c4489d64428978b9f771c9d2edcef512
parent 459049719cce0f5b1d595c2a9fa50e3a75550b2b
parent d06a73bcb330e1a560373158be9009daef10a046
author The Android Open Source Project <initial-contribution@android.com> 1339080719 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339080719 -0700

am d06a73bc: Reconcile with jb-release

* commit 'd06a73bcb330e1a560373158be9009daef10a046':