summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-01-27 19:55:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-27 19:55:29 +0000
commitb2b9b2dbdbc0445080d3c2d15212a43ba1f9cff1 (patch)
treec779ec77b2b38a183a2f5e012dbd03a7380af528 /drm
parent8e26486d2d811f94118381a163178078a3eee6c0 (diff)
parent1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02 (diff)
downloadframeworks_av-b2b9b2dbdbc0445080d3c2d15212a43ba1f9cff1.zip
frameworks_av-b2b9b2dbdbc0445080d3c2d15212a43ba1f9cff1.tar.gz
frameworks_av-b2b9b2dbdbc0445080d3c2d15212a43ba1f9cff1.tar.bz2
am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
* commit '1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02': Only increase the counter when we do take a wakelock
Diffstat (limited to 'drm')
0 files changed, 0 insertions, 0 deletions