diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-11 22:04:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 22:04:27 -0700 |
| commit | 6c80c2b64b0fd49c8f378b5196537f2680210229 (patch) | |
| tree | 0eea8c5963e03d35f60c1df623e818d40963952b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ea6dbaf3029783fba305fe6323c504accc3c2fd7 (diff) | |
| parent | ce6d43a32afcd79e0b3a0dfa716fd0f3cb36b78b (diff) | |
am fb86ce93: Add watermark support.
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp
* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
Add watermark support.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions