diff options
| author | Cary Clark <cary@android.com> | 2010-04-05 12:33:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 12:33:03 -0700 |
| commit | 4f1f69f5f6de9370f539f031d90dc85236c5527d (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 16e688e1544b124be003f927c617d8a36ee4cbd8 (diff) | |
| parent | 7024369f915f43f48b52682fa00162868bde4597 (diff) | |
am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken
* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
check for webviewcore before reading settings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions