diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-25 17:32:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 17:32:00 -0700 |
| commit | 4ebb93aef956cfa4e7c49ab15d6c1e55e494347d (patch) | |
| tree | 6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | abb0c2ecc95160f850b5bfdbaae3ca7dfc9db756 (diff) | |
| parent | c59c76339c8f7d7f6cf355cda88b2ef333b959f7 (diff) | |
am d72c1172: am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
Merge commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa'
* commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa':
reserve android.opengl.GLWallpaperService name for future use
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions