| commit | 77f0a7535d2f785c70a2e682a1db665576fb9d7e | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Wed Jan 04 21:52:04 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 04 21:52:04 2012 -0800 |
| tree | 197a1bd990333021bf7e1dcf4f030b521b902fce | |
| parent | e9e2f6f78a08060640b1bc38812d30f12bdd589c [diff] | |
| parent | 53cc3c7676fd026e743de1e884632bb9b49b702a [diff] |
am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 * commit '875b69928193e464243cf491bfe861f30644e9b4': Do not allow file:// access when it is disabled. Do not merge.