summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-07-19 10:18:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-19 10:18:25 -0700
commit0044cffa75e16b387821fcc2aee2e96172480bba (patch)
tree62a3555429c3caf6d6220df764adf91a9ee9b991 /opengl/tests/gl_basic/gl_basic.cpp
parente5b9400b84eadfb1a13383d710e360807eb8e1a0 (diff)
parent0092886a15a8a1b6db565b4a0813d028ba5d9482 (diff)
am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"
* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9': Copy once-created R.java into library projects
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions