tree dc28f509fae5cb9d3e720e24ddb4d699b538563b
parent 7f5c1502beda6916caff1fb4b77a48dff3ee90d5
parent f1b2490c0cc52e02de4ddb0682835d2df0240f4c
author The Android Open Source Project <initial-contribution@android.com> 1351700361 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700361 -0700

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

* commit 'f1b2490c0cc52e02de4ddb0682835d2df0240f4c':