tree 5862b78d667371e87353d024d877a07edf11fa94
parent b1cfada58a7a259e527e025b2b69806ef8121a57
parent 600a72784d7e928167ad0865d6ef2b2fd62a31db
author The Android Open Source Project <initial-contribution@android.com> 1352233749 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233749 -0800

am 600a7278: (-s ours) am c0aec062: am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '600a72784d7e928167ad0865d6ef2b2fd62a31db':