diff options
| author | Bart Sears <bsears@google.com> | 2012-01-04 13:47:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-04 13:47:09 -0800 |
| commit | 66577b602c71ce65a39967fbc51b6c7c38a82217 (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 11cb4c04a399e6af7f39f0bd9b9976f4270689f5 (diff) | |
| parent | 1e2efa6270c54ccd16f3e2b3311ecdd972f0ee92 (diff) | |
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions