OSDN Git Service

Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
authorPankaj Kanwar <pkanwar@google.com>
Mon, 24 Oct 2016 02:02:48 +0000 (02:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Oct 2016 02:02:51 +0000 (02:02 +0000)

Trivial merge