tree 809c44528cf8af59657e2adebfff87f010f479eb
parent 8d9b0bea37689cfb08c4cee128c048adf55440ee
parent f415644a7045b81539b622f053a0828b57022fbc
author Paul Miller <paulmiller@google.com> 1428362067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428362067 +0000

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

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