tree 816400ccfc9632b7de7a35061a0ca5025c9c2a76
parent 3a2286ed1770865c324655c197bd315adc5d4149
parent b9bf3ee004e70555219cd40b64e8eb1bcbf00df0
author The Android Open Source Project <initial-contribution@android.com> 1337875431 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337875431 -0700

am b9bf3ee0: Reconcile with jb-release

* commit 'b9bf3ee004e70555219cd40b64e8eb1bcbf00df0':