tree 077354a2b285cb0ffad255d3f08a2ff69c013594
parent 9316c866b0ea9507bb22265e2485fd924def4c6a
parent 3d646745f76f1f39c295d0da9d17419c237ae186
author The Android Open Source Project <initial-contribution@android.com> 1349450458 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349450458 -0700

am 3d646745: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3d646745f76f1f39c295d0da9d17419c237ae186':