tree 8280375b1ddf9e0179efbb61092907052943111d
parent 144281282b1d8b8cb9e6c9b50ad6ccd66da42838
parent 9aaf2a65e3cbc6866cfd50fe5f3341063c71f36f
author The Android Open Source Project <initial-contribution@android.com> 1370540337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370540337 -0700

am 9aaf2a65: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '9aaf2a65e3cbc6866cfd50fe5f3341063c71f36f':