commit | d0bf143319d7d91de24e82ba0e915f147dbb8a18 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri Dec 09 04:13:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 09 04:13:07 2016 +0000 |
tree | 57ad4600e8763d9fbe59cd574866349f2aab403d | |
parent | af7cf01a1936066a62e0a564eafb6854d058ec66 [diff] | |
parent | a5c3078e10ef59d4dd8e7f9ab751b43753cc20f6 [diff] |
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility. am: b55bf38351 -s ours am: d1c92f25b3 -s ours am: f32347ef25 am: a5c3078e10 -s ours Change-Id: I7073be448d76e3af562322ab759cc6b3296dda2c