commit | f415644a7045b81539b622f053a0828b57022fbc | [log] [tgz] |
---|---|---|
author | Paul Miller <paulmiller@google.com> | Mon Apr 06 18:29:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 18:29:55 2015 +0000 |
tree | b35e87509b503d60ee521346fa66d6ffea8d6ad5 | |
parent | edc3e7a47afdef95b483f656314829574e67727b [diff] | |
parent | dc9c958256a66c333c1048ad21f1de8c1c0cdad3 [diff] |
am dc9c9582: Merge "Revert "Restrict "javascript" and "file" scheme intents"" * commit 'dc9c958256a66c333c1048ad21f1de8c1c0cdad3': Revert "Restrict "javascript" and "file" scheme intents"