summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-02-07 13:49:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-07 13:49:31 -0800
commitb5fc0409ef60c1c48b53487e4bb3b2e40624dfc1 (patch)
tree52204922ecf462be54a0e49d8038166d5086f6e4 /opengl/tests/gl_basic/gl_basic.cpp
parent5bdbb562ee8c995eed5c34f2b0249afd913f2b89 (diff)
parent57bb7faf9793329babe04493d89d891ef482ac4f (diff)
am 57bb7faf: am 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
* commit '57bb7faf9793329babe04493d89d891ef482ac4f': LayoutLib: Replace custom BitmapFactory by a simpler delegate
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions