am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it...
am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '875b6992':
Do not allow file:// access when it is disabled. Do not merge.