tree 205374dc736377ed213616d89593722a4571510f
parent 5380148f83d154e22cdc2e4e170a57f1e37754e6
parent 2480debbb932d211008780ba30988c3e3977a3fe
author The Android Open Source Project <initial-contribution@android.com> 1354895683 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354895683 -0800

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

* commit '2480debbb932d211008780ba30988c3e3977a3fe':