tree 5f1a866cdd1e08522ebc754542baa6b9d1fe05ff
parent 535529332ff2fcf901e7a062e133aed54a03c13a
parent 0ee0fa2f625c61ee6e631dceb0ee81918fd96df3
author The Android Open Source Project <initial-contribution@android.com> 1360100932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360100932 -0800

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

# Via The Android Automerger (3) and The Android Open Source Project (1)
* commit '0ee0fa2f625c61ee6e631dceb0ee81918fd96df3':