summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2014-03-11 00:11:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 00:11:10 +0000
commitdaa1c96954f666b9f661501e11014a57533eefad (patch)
tree0a895d88fabb5123eb7f5eddf4d642d665d9d84d /native
parentf2e837e57900514a554f174a29730157160c1fa1 (diff)
parentaaf23a9a653457cccf54293b2ff76196718c7a1a (diff)
downloadframeworks_base-daa1c96954f666b9f661501e11014a57533eefad.zip
frameworks_base-daa1c96954f666b9f661501e11014a57533eefad.tar.gz
frameworks_base-daa1c96954f666b9f661501e11014a57533eefad.tar.bz2
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
Diffstat (limited to 'native')
0 files changed, 0 insertions, 0 deletions