diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-10 11:41:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:41:14 -0700 |
| commit | 1716a441a4ff87776b3cd77e3c8a46a0ade06550 (patch) | |
| tree | d5a841ac5398e266e4f9ebf08a08cae6d1a63e0e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ab9d21919b69e0e9017b68a8801b118c9804b3dd (diff) | |
| parent | 276ed8df4fa1cafa066555753b901ea600fb0365 (diff) | |
am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
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