tree 250dc4716a50b04fe102371a42f9692ecb9e8182
parent 1a474d0e5c08ea8fedef967ca516db07431260bd
parent c2203765ea773939cc1a3fe3a77d887c91d0719b
author The Android Open Source Project <initial-contribution@android.com> 1347494355 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347494355 -0700

am c2203765: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c2203765ea773939cc1a3fe3a77d887c91d0719b':