tree 183ba2477a3a95ad8adbef5a4437a238ece80828
parent 874e0edc8875776588dd42dca29cdb0a10b76eb0
parent 1e6561ddfc941d51592a4285c8fe2d054ed29f02
author The Android Open Source Project <initial-contribution@android.com> 1352234051 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234051 -0800

am 1e6561dd: (-s ours) am 17f1fe1a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '1e6561ddfc941d51592a4285c8fe2d054ed29f02':