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

* commit '875b69928193e464243cf491bfe861f30644e9b4':
  Do not allow file:// access when it is disabled. Do not merge.
This commit is contained in:
Bart Sears 2012-01-04 21:52:04 -08:00 committed by Android Git Automerger
commit 77f0a7535d

Diff Content Not Available