tree b0a743c4de41fc198725c34f138b922bd4910f59
parent 5140a03d786aa4f9d3a1daf062374b9dea629327
parent 50531071da987d051a222ea5c5e595011fc8629a
author The Android Open Source Project <initial-contribution@android.com> 1344284495 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344284495 -0700

am 50531071: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '50531071da987d051a222ea5c5e595011fc8629a':