tree 85f2369be584c47eb3277a117750fa4a3c5dd04a
parent 5164789faf93604b3a4569366b63f8e34ee1b4a9
parent 526a09b39f2c4d80731bdb8352f00dd022fee3ad
author The Android Open Source Project <initial-contribution@android.com> 1364925857 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364925857 -0700

am 526a09b3: Reconcile with jb-mr2-release - do not merge

* commit '526a09b39f2c4d80731bdb8352f00dd022fee3ad':