diff options
author | Xavier Ducrohet <xav@android.com> | 2012-02-23 18:45:56 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 18:45:56 -0800 |
commit | 7a5798987a6cdaf7cd3be885fc6ca15651f91cd4 (patch) | |
tree | 0ecbd0769f339854cca023a8cf56e75f0ba5aa63 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 27c4a423c2692dd6aa89e83863cf4dd581a83260 (diff) | |
parent | aafceff69fea74737d8a211e41caf03ce3294d95 (diff) |
am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit 'f31297edf899997dc9f173f6ddca30b0e4f2d677':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions