diff options
| author | Jason Chen <jasonchen@google.com> | 2010-09-01 19:39:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 19:39:00 -0700 |
| commit | 6047b028a8f49938cd5c85890dcabdf7a9b7561f (patch) | |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2503b4726d7f067c4f47a298de5069392c15be5f (diff) | |
| parent | d364339a9d697787280f9e2ce36aa21f760e7be9 (diff) | |
am 9fadca71: (-s ours) am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit '9fadca71e455a6c849311083677351d4dc64b792'
* commit '9fadca71e455a6c849311083677351d4dc64b792':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions