tree 65a080e803f57a0b1cdef60fdd6e870234afaff1
parent ae5d1c39dd25ad659eeae96ab860f46c6e02ce25
parent dc23178be51dc97c05eab0504a91d0c0beb75806
author The Android Open Source Project <initial-contribution@android.com> 1345904491 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345904491 -0700

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

* commit 'dc23178be51dc97c05eab0504a91d0c0beb75806':
  Temporary fix for qsb and hotseat clicking issues