| commit | eece33395561fff249afc96749cd69a21c28fbac | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Dec 17 18:36:31 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 17 18:36:31 2014 +0000 |
| tree | fe82160a151d5d5b6d16e25dc7d8713a96e958de | |
| parent | 525833bea31390ba3e7f72839e547b705080e4c5 [diff] | |
| parent | ee8feae5d4624e6759e264cc80eac28b0d0af20f [diff] |
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.