tree 513e6e84f185bbc09631eecb138d22496fc27f25
parent 22c38e67d4e49f5f660f50fa4e1bd6359024cb91
parent 70c274361ec6089c5ed9d1a62877d51b9ec1dcc8
author Jeff Brown <jeffbrown@android.com> 1394498277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394498277 +0000

am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on"

* commit '70c274361ec6089c5ed9d1a62877d51b9ec1dcc8':
  Hang off call by power button while screen is on