tree 73307f9abea09f26a22ed175776fc0c83111a873
parent e507f5d62c4adcac7e038824178070ed0e49a0fb
parent 7db2f5bf24c20c613c0f76a19e810f91e752976c
author The Android Open Source Project <initial-contribution@android.com> 1340115640 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340115640 -0700

am 7db2f5bf: Reconcile with jb-release

* commit '7db2f5bf24c20c613c0f76a19e810f91e752976c':