tree 8ad1b340a6cf206802d4d1c97919c0ef518782e6
parent 803b2acb8ff92cf295a42423d266d4122e9c496e
parent f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f
author The Android Open Source Project <initial-contribution@android.com> 1352734112 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352734112 -0800

am f8fbfd9f: Reconcile with jb-mr1-release - do not merge

* commit 'f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f':