diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-04-10 11:48:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:48:24 -0700 |
| commit | 4393b01383e86a6c31e888eeb82c9f5e3f7f468c (patch) | |
| tree | c4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 02dd5476bb0c03b7c9a1cd8e90e44ee9065263a1 (diff) | |
| parent | b19ad22c417d87abaa7fe0d3493be9158c3266ec (diff) | |
am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken
* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions