tree 3a732a7774a1202e8c08f9e8817c03c90963ed26
parent 1378852b9a5db0986b504b6d6767527cdd7685a1
parent 8c9ca6491b5819b5304b42186f5f0fff7e5eb156
author The Android Open Source Project <initial-contribution@android.com> 1352418700 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352418700 -0800

am 8c9ca649: (-s ours) am 36f9ca38: am 17e06817: Reconcile with jb-mr1-release - do not merge

* commit '8c9ca6491b5819b5304b42186f5f0fff7e5eb156':
  JOP39