diff options
| author | Bart Sears <bsears@google.com> | 2012-01-04 21:52:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-04 21:52:04 -0800 |
| commit | 39f05540988775fa44c5ca6a535bf329889b8720 (patch) | |
| tree | bdeeece3bdad99f55c8bdcd53fb901c22ef18fb8 /opengl/libagl/TextureObjectManager.cpp | |
| parent | dc8627e7dcd019ec328878b1f7855890d39ed0ab (diff) | |
| parent | 875b69928193e464243cf491bfe861f30644e9b4 (diff) | |
am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '875b69928193e464243cf491bfe861f30644e9b4':
Do not allow file:// access when it is disabled. Do not merge.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions