tree 38d9ca70713201a2d5a8e00f590eaf320b9c4516
parent ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b
parent 07c8a6d238ddf855d5d6b4421d2527c580a374b6
author The Android Open Source Project <initial-contribution@android.com> 1352233811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233811 -0800

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

* commit '07c8a6d238ddf855d5d6b4421d2527c580a374b6':