tree aee8594b43800f6d56f8b5f78062fced5af5b5a7
parent bff680aeadbc89afb45baec83ff414ebeb80c1f0
parent 50926ed43509b7d16a2c4b9375f53986cc9a28b7
author The Android Open Source Project <initial-contribution@android.com> 1349194885 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349194885 -0700

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

* commit '50926ed43509b7d16a2c4b9375f53986cc9a28b7':