tree 0a895d88fabb5123eb7f5eddf4d642d665d9d84d
parent f2e837e57900514a554f174a29730157160c1fa1
parent aaf23a9a653457cccf54293b2ff76196718c7a1a
author Jeff Brown <jeffbrown@android.com> 1394496670 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394496670 +0000

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

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