OSDN Git Service

Merge "Do not allow file:// access when it is disabled."
authorBen Murdoch <benm@google.com>
Tue, 3 Jan 2012 10:53:58 +0000 (02:53 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Jan 2012 10:53:58 +0000 (02:53 -0800)

Trivial merge