| commit | c266f62fd9f241b0d122bae7ad016ecd58ab40da | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Dec 17 18:43:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 18:43:36 2014 +0000 |
| tree | d6f811f030da510811b89516d275f9a48add6cf6 | |
| parent | 25c29c19474e5cb359473d3d36fdb1eddb90f50b [diff] | |
| parent | eece33395561fff249afc96749cd69a21c28fbac [diff] |
am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae * commit 'eece33395561fff249afc96749cd69a21c28fbac': Show broken lock image when SSL errors are encountered in CaptivePortalLogin.