tree 0ffa5ba512ec22b2af06a69524d0bf089b3074ae
parent 10b8e684e1945edfb60ec4391ac4c7f3d8bf4172
parent b7afc4e15b29d933477328d1944c3201337808c6
author The Android Open Source Project <initial-contribution@android.com> 1352233630 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233630 -0800

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

* commit 'b7afc4e15b29d933477328d1944c3201337808c6':