Commit 0b3c00dc authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into... 

Merge "Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev am: 41f9bbd8" into marshmallow-cts-dev
parents 73a8be40 9338b5ab
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