diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-09 23:32:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-09 23:32:58 -0800 |
commit | 07b4185c7494744d0886115c7d8a6a389210bea3 (patch) | |
tree | 962bd02dce7811a0e23c29124ef57aae9943d3f9 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | c2f49e67e9fae9135044e2b513cde9d4d097dc63 (diff) | |
parent | 7371ed684eae344faa7c312219e09c7ae99156d8 (diff) |
Merge change I98819b18 into eclair-mr2
* changes:
Allow resource and file URIs in ImageView.setImageURI()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions