am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base