tree 9d6bbcfd4d36a610389e929ddcc9dfa06bed6ef9
parent 086ec8d03c06e0b8a1a9073ed741e7e2d1705107
parent 5185a003d02fbcfb78b0a8a83932aac7ab27e6d8
author The Android Open Source Project <initial-contribution@android.com> 1355255828 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355255828 -0800

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

* commit '5185a003d02fbcfb78b0a8a83932aac7ab27e6d8':