OSDN Git Service

Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin...
authorPaul Jensen <pauljensen@google.com>
Wed, 17 Dec 2014 18:36:31 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Dec 2014 18:36:31 +0000 (18:36 +0000)
commiteece33395561fff249afc96749cd69a21c28fbac
treefe82160a151d5d5b6d16e25dc7d8713a96e958de
parent525833bea31390ba3e7f72839e547b705080e4c5
parentee8feae5d4624e6759e264cc80eac28b0d0af20f
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
automerge: ee8feae

* commit 'ee8feae5d4624e6759e264cc80eac28b0d0af20f':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.