summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2010-07-26 10:26:46 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-26 10:26:46 -0700
commit7b5b20ef678a7b07946f85370f9654ca7ff11c01 (patch)
tree16752f12b55255830f303dec7fd711a318e4950f /libs/hwui/OpenGLRenderer.cpp
parent92fba4bc019903f3f37905a0270441e88ccf23a9 (diff)
parentbd01583d6e936e93141d6b77aec9d8c99684d7a4 (diff)
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4' * commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4': move native services under services/
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions