tree d5a841ac5398e266e4f9ebf08a08cae6d1a63e0e
parent ab9d21919b69e0e9017b68a8801b118c9804b3dd
parent 276ed8df4fa1cafa066555753b901ea600fb0365
author Kristian Monsen <kristianm@google.com> 1270924874 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270924874 -0700

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