tree 01610dec479020fa54355b283d31f8c58b1c59f3
parent 48f97112aa6f98cb3945ecab5397b14a25dbb9ab
parent 3d1b492606ffe30bd28f869546d88c4f19c933ed
author The Android Open Source Project <initial-contribution@android.com> 1352234042 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234042 -0800

am 3d1b4926: (-s ours) am 812eb3c5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '3d1b492606ffe30bd28f869546d88c4f19c933ed':