tree af86f54f2ca45cc699a4c83811e6b9f440a5f078
parent 3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1
parent daa1c96954f666b9f661501e11014a57533eefad
author Jeff Brown <jeffbrown@android.com> 1394496911 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394496911 +0000

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

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