diff options
| author | Patrick Scott <phanna@android.com> | 2009-12-04 11:12:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 11:12:55 -0800 |
| commit | 73d403324bd8af48b20fc1bbbb2cf3502f1407cd (patch) | |
| tree | 92c6a8f70909542eda60bb16a4c7f32a7d81d0d2 /opengl/java/android/opengl/Texture.java | |
| parent | 83086f5abbc84bd3ded576161c1709d0e3611ca4 (diff) | |
| parent | c593d60787e9abd75c94f70bd929ae13414411e9 (diff) | |
am c593d607: Merge change I4261c58d into eclair-mr2
Merge commit 'c593d60787e9abd75c94f70bd929ae13414411e9' into eclair-mr2-plus-aosp
* commit 'c593d60787e9abd75c94f70bd929ae13414411e9':
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