tree 8d78ebadb9c33191a0490537dbd50da4e6c85b49
parent 4b85fbee6fafae65a1d7122555ab8bc68fc20405
parent c05c993c9d11a183c5af24257cd5b4c4b1661706
author The Android Open Source Project <initial-contribution@android.com> 1348170537 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348170537 -0700

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

* commit 'c05c993c9d11a183c5af24257cd5b4c4b1661706':