summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-07-10 13:47:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-10 13:47:15 +0000
commit6393105afb1793ba4250cab838dd2e5a6ad8d7c2 (patch)
tree8eed58e527aae6f9a065e5a22133f85c8a397b26 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6999649f0d70ecfdeb07685b3955c9b6423f52ad (diff)
parentae62bb1d41e9a969d1ef751476f8dc2fdedf7b6c (diff)
Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours
am: ae62bb1d41 Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions