diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-10 11:47:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:47:23 -0700 |
| commit | c58af6b44c0a5c718a46e6e22d0eb947fd2dad65 (patch) | |
| tree | 0221e52f74a0b4fb7b87fe976b11d0908fccf87a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 79e351ecda78c3ce5da9944d0f0312c3da376554 (diff) | |
| parent | 1716a441a4ff87776b3cd77e3c8a46a0ade06550 (diff) | |
am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken
* commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31':
Do not create intents for application/xhtml+xml
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions