diff options
| author | Jason Chen <jasonchen@google.com> | 2010-09-01 19:16:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 19:16:41 -0700 |
| commit | d364339a9d697787280f9e2ce36aa21f760e7be9 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e6529a2f2b792f831c5f290c3c3c49f30c03a087 (diff) | |
| parent | af538c26bc7cca1423303dd1b79678fbe7a4499c (diff) | |
am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp
* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
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