tree fb90bdf484d931322c08707793da1131a96353f0
parent ae36f1e9f30d1d3e3951a9e55f084ab4ce229c87
parent 08ea3b10b482d4d08e59e03291d2feb3b361500d
author The Android Open Source Project <initial-contribution@android.com> 1352233877 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233877 -0800

am 08ea3b10: (-s ours) am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '08ea3b10b482d4d08e59e03291d2feb3b361500d':