tree b35e87509b503d60ee521346fa66d6ffea8d6ad5
parent edc3e7a47afdef95b483f656314829574e67727b
parent dc9c958256a66c333c1048ad21f1de8c1c0cdad3
author Paul Miller <paulmiller@google.com> 1428344995 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428344995 +0000

am dc9c9582: Merge "Revert "Restrict "javascript" and "file" scheme intents""

* commit 'dc9c958256a66c333c1048ad21f1de8c1c0cdad3':
  Revert "Restrict "javascript" and "file" scheme intents"