OSDN Git Service

am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge...
authorBart Sears <bsears@google.com>
Wed, 4 Jan 2012 21:49:34 +0000 (13:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jan 2012 21:49:34 +0000 (13:49 -0800)
commit53cc3c7676fd026e743de1e884632bb9b49b702a
tree485b152b97bf8321fdd223f35587bb4294672be8
parent2ae141d964ea7e2f1cc9beceb6641ec779cad8ef
parent66577b602c71ce65a39967fbc51b6c7c38a82217
am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1

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