summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLDebugRenderer.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2010-09-29 22:13:21 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-29 22:13:21 -0700
commitd4c2a2f18728651c3d4191654389886cab5bf2bb (patch)
tree1bc18fb8c236ab87d2c3c3e9001931191ea34666 /libs/hwui/OpenGLDebugRenderer.cpp
parentda5917ec359eeee04f83672958c10891afe01f16 (diff)
parent198297b495d975cd4889f5136cd69368bd319eed (diff)
am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
Merge commit '198297b495d975cd4889f5136cd69368bd319eed' * commit '198297b495d975cd4889f5136cd69368bd319eed': Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
Diffstat (limited to 'libs/hwui/OpenGLDebugRenderer.cpp')
0 files changed, 0 insertions, 0 deletions