| commit | 93bdc6abd4c4afa70e75ab5e692f704b0c5c10b9 | [log] [tgz] |
|---|---|---|
| author | Tim Volodine <timvolodine@google.com> | Thu Feb 08 17:22:38 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 08 17:22:38 2018 +0000 |
| tree | 6d7f8bac10e2a9499a89f17d0ed51a40bf834822 | |
| parent | df74d2b3a8db0918517d56bad0e545960f446079 [diff] | |
| parent | 0b3c00dc926e1062b6a75638260ece5aa4cf0f94 [diff] |
Merge "Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev am: 41f9bbd81a" into marshmallow-cts-dev am: 0b3c00dc92 Change-Id: I5d6a1c53001901493a7071b70d35ec8d81a21ea4