diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-11 22:10:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 22:10:07 -0700 |
| commit | 2acf2480496075292d1085553289f1d5dc70dd16 (patch) | |
| tree | aaca7adc70d98512e2bc4e2536b7533efc99bbd7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7bf432b8e41c7bf95244ad598a07b5837867954d (diff) | |
| parent | 6c80c2b64b0fd49c8f378b5196537f2680210229 (diff) | |
am 9185e26a: am fb86ce93: Add watermark support.
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e'
* commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e':
Add watermark support.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions