summaryrefslogtreecommitdiffstats
path: root/opengl/java/com
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2014-03-11 00:37:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 00:37:57 +0000
commit9a3ed5bd3c2e41702c16b39c0c8e125178c225d2 (patch)
tree513e6e84f185bbc09631eecb138d22496fc27f25 /opengl/java/com
parent22c38e67d4e49f5f660f50fa4e1bd6359024cb91 (diff)
parent70c274361ec6089c5ed9d1a62877d51b9ec1dcc8 (diff)
downloadframeworks_base-9a3ed5bd3c2e41702c16b39c0c8e125178c225d2.zip
frameworks_base-9a3ed5bd3c2e41702c16b39c0c8e125178c225d2.tar.gz
frameworks_base-9a3ed5bd3c2e41702c16b39c0c8e125178c225d2.tar.bz2
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
Diffstat (limited to 'opengl/java/com')
0 files changed, 0 insertions, 0 deletions