| commit | 53cc3c7676fd026e743de1e884632bb9b49b702a | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Wed Jan 04 13:49:34 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 04 13:49:34 2012 -0800 |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 | |
| parent | 2ae141d964ea7e2f1cc9beceb6641ec779cad8ef [diff] | |
| parent | 66577b602c71ce65a39967fbc51b6c7c38a82217 [diff] |
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.