summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-06-17 13:53:48 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-17 13:53:48 -0700
commit29f28cfe2188179519094e35d7fad09588170e88 (patch)
tree1cae39337e16487faf17612c9eb7553d5dce509d /libs/hwui/OpenGLRenderer.cpp
parent42bb545a54d89f0ddbb230d7a01ea4210c0f6c00 (diff)
parente899caf8cce1d1a20121f19a99899553ae2b327e (diff)
am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp * commit 'e899caf8cce1d1a20121f19a99899553ae2b327e': Fixed api/current.xml after a bad merge.
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions