OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 525833b ee8feae)
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)
automerge: ee8feae

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


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help