diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-12-17 18:36:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-17 18:36:31 +0000 |
| commit | eece33395561fff249afc96749cd69a21c28fbac (patch) | |
| tree | fe82160a151d5d5b6d16e25dc7d8713a96e958de /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| 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.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions