am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1

Browse Source

* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.

...

This commit is contained in:

Bart Sears 2012-01-04 13:49:34 -08:00 committed by Android Git Automerger

parent 2ae141d964 66577b602c

commit 53cc3c7676

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available