OSDN Git Service

Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
authorBart Sears <bsears@google.com>
Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)
commit66577b602c71ce65a39967fbc51b6c7c38a82217
tree485b152b97bf8321fdd223f35587bb4294672be8
parent11cb4c04a399e6af7f39f0bd9b9976f4270689f5
parent1e2efa6270c54ccd16f3e2b3311ecdd972f0ee92
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1