summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-06-17 13:57:05 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-17 13:57:05 -0700
commit7cbd36f8d78d682ffbe264e08979e714ce0aa8c6 (patch)
tree2bc6d45256fea5bf8cf369f2a808b5df5cfd90c2 /libs/hwui/OpenGLRenderer.cpp
parent3b970e78d2974eacc621258bb6e581d458d9bbd3 (diff)
parent29f28cfe2188179519094e35d7fad09588170e88 (diff)
am 29f28cfe: am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit '29f28cfe2188179519094e35d7fad09588170e88' * commit '29f28cfe2188179519094e35d7fad09588170e88': Fixed api/current.xml after a bad merge.
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions