Commit 41f9bbd8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev

parents 5a5e5e64 30e74bc1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment