tree 8ad1b340a6cf206802d4d1c97919c0ef518782e6
parent f2645eaaed802a84eec1314306c191eac309517d
parent 5ab5655343591baa8b315f8f0513112a1798d389
author The Android Open Source Project <initial-contribution@android.com> 1352734272 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352734272 -0800

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

* commit '5ab5655343591baa8b315f8f0513112a1798d389':