tree 43610f1c7b55d3087eef3615f110d0ae616439c2
parent 47be125eca98c2a3802395d8b86234511a383fd6
parent f5672feccfc4b3be0ddecc092b949710dec47bba
author The Android Open Source Project <initial-contribution@android.com> 1350312198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350312198 -0700

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

* commit 'f5672feccfc4b3be0ddecc092b949710dec47bba':