tree 3489c48a31d7afbae4c5eff45ad791133e90c2af
parent 514868c78b4230ef59d7a7dd9b8f383fef6e2830
parent 582299dd46465c5cd932783116c83504a852650f
author The Android Open Source Project <initial-contribution@android.com> 1352233468 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233468 -0800

am 582299dd: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '582299dd46465c5cd932783116c83504a852650f':