diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-25 17:28:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 17:28:50 -0700 |
| commit | c59c76339c8f7d7f6cf355cda88b2ef333b959f7 (patch) | |
| tree | 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f88784da86f7109937563a3a44afdfa6c108142b (diff) | |
| parent | 37f2bb9e3fb0a5c352786249470920eb5c166f13 (diff) | |
am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp
* commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb':
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