Commit 9338b5ab authored by Tim Volodine's avatar Tim Volodine Committed by android-build-merger
Browse files

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

am: 41f9bbd8

Change-Id: Icd9f5d72f05c54e59fcf2baedadc0ed3fab04204
parents 73a8be40 41f9bbd8
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