diff options
| author | James Dong <jdong@google.com> | 2010-04-01 10:46:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 10:46:57 -0700 |
| commit | b2215d40b4ef31754b70a0707ef46e54d5f09bdd (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 15d3fb1e18185326ab84cd3710e5645654b520e9 (diff) | |
| parent | 5627f6093ab0cb93c57ca0130bca3e3ce8478cc8 (diff) | |
am d12d6c30: am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Merge commit 'd12d6c305caeea556781083152e741bdb3863eff' into kraken
* commit 'd12d6c305caeea556781083152e741bdb3863eff':
Public API changes for CameraProfile and CamcorderProfile classes
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions