tree 0f6eece1a49f3ce0ba4c0c01b64d59587f937d9f
parent f3af614261f11308cfa65c70d484b71217893402
parent 35abf7abd1eb3a9f5de7a6ae8114f95e6183019d
author The Android Open Source Project <initial-contribution@android.com> 1348679263 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348679263 -0700

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

* commit '35abf7abd1eb3a9f5de7a6ae8114f95e6183019d':