summaryrefslogtreecommitdiffstats
path: root/opengl/java/com
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2014-03-11 00:15:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 00:15:11 +0000
commit70c274361ec6089c5ed9d1a62877d51b9ec1dcc8 (patch)
treeaf86f54f2ca45cc699a4c83811e6b9f440a5f078 /opengl/java/com
parent3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1 (diff)
parentdaa1c96954f666b9f661501e11014a57533eefad (diff)
downloadframeworks_base-70c274361ec6089c5ed9d1a62877d51b9ec1dcc8.zip
frameworks_base-70c274361ec6089c5ed9d1a62877d51b9ec1dcc8.tar.gz
frameworks_base-70c274361ec6089c5ed9d1a62877d51b9ec1dcc8.tar.bz2
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
Diffstat (limited to 'opengl/java/com')
0 files changed, 0 insertions, 0 deletions