diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-22 16:29:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 16:29:56 -0700 |
| commit | 27d6a25bc2479adcb57bf639528f109aee1b56e4 (patch) | |
| tree | 0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7c4f81b0d37a28b90209717e702d3664cbe8a19a (diff) | |
| parent | 0bc7251d3a10b6ca5e97312f13c1675e6369c6ba (diff) | |
am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo
Merge commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken
* commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a':
Fix issue #2608292: Fails to launch the video camera preview
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions