tree 3ed3a4f6b18a5ae47f55ab4b124a6104ac670b3c
parent c39bcb00a3c791998163e9f1d4d72fccdf48ca3e
parent f072e3d20531ca452a51bd45f863abb23f2e3968
author The Android Open Source Project <initial-contribution@android.com> 1352234049 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234049 -0800

am f072e3d2: (-s ours) am a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f072e3d20531ca452a51bd45f863abb23f2e3968':