diff options
| author | Patrick Scott <phanna@android.com> | 2009-12-04 11:18:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 11:18:21 -0800 |
| commit | 057fd95f8094fc8d41e3704b0830c91d7817b4b2 (patch) | |
| tree | fcb8d66a319f850d32f0e36a8a9a1f917f9fdb3a /opengl/java/android/opengl/Texture.java | |
| parent | c636fb3bcde53f97d18c41c231c7f2914a0db470 (diff) | |
| parent | 73d403324bd8af48b20fc1bbbb2cf3502f1407cd (diff) | |
am 73d40332: am c593d607: Merge change I4261c58d into eclair-mr2
Merge commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd'
* commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd':
Check if another Activity wants to intercept an xml mime type.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions