| commit | 0b3c00dc926e1062b6a75638260ece5aa4cf0f94 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Thu Feb 08 17:17:48 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Feb 08 17:17:48 2018 +0000 |
| tree | e47cc0131f24d8d3c2dbca63d385c614943fbf1a | |
| parent | 73a8be40e76c9ef638a000f4978cd7055efdd185 [diff] | |
| parent | 9338b5abff787536676e6ba90705cbbd4029095c [diff] |
Merge "Merge "Fix broken CTS test: WebSettingsTest#testAllowMixedMode" into lollipop-mr1-cts-dev am: 41f9bbd81a" into marshmallow-cts-dev