| commit | 6727e4875120358882312d9395040c883011749c | [log] [tgz] |
|---|---|---|
| author | Tim Volodine <timvolodine@google.com> | Thu Feb 08 17:28:37 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 08 17:28:37 2018 +0000 |
| tree | ef91f507ab83f6f29825c551fb4fbb4f8be0eee1 | |
| parent | 61ca6b326ff95276aa9af3c8b9a7777233877449 [diff] | |
| parent | af8caff2fd7d1e5a94c084cb87cee3bf056b415b [diff] |
Merge "Merge "Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev am: 41f9bbd81a" into marshmallow-cts-dev am: 0b3c00dc92" into nougat-cts-dev am: af8caff2fd Change-Id: Ie0d252d949d412db45a88c9228c5f816ec3ff52d