tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 89ab04fad414d8619437fce158c7671ae0a107a3
parent 062347a08f29408f188a07a78e0b064fc7218c30
author The Android Open Source Project <initial-contribution@android.com> 1343429493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343429493 -0700

am 062347a0: am 115b146c: Reconcile with jb-mr0-release jb-release

* commit '062347a08f29408f188a07a78e0b064fc7218c30':