tree 3171014a8a73f77c618d8be6a92174a62787e050
parent b5eeda968988a84935d07509f677b5693b112741
parent a8293416f518a38b94ae6b39efc7490d34f09e85
author The Android Open Source Project <initial-contribution@android.com> 1346945031 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346945031 -0700

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

* commit 'a8293416f518a38b94ae6b39efc7490d34f09e85':