tree 4304a5951c9ea5766357c2c5197c1147eaa1f46b
parent 0353b14cd4d7738cd5d5930884dcdca83383bafd
parent acbdb76a6bf9953e8e80bd59a41f456c27ddfa25
author The Android Open Source Project <initial-contribution@android.com> 1352925898 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352925898 -0800

am acbdb76a: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'acbdb76a6bf9953e8e80bd59a41f456c27ddfa25':