summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-07-14 09:59:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-14 09:59:31 +0000
commitbc67fd74c0b0231975935ba6b8fbb49f3b47c125 (patch)
treeec5ee29cac4934d75d08cc2e6b81fd7012c80707 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8b46acba25e33889b275fc6639df75aa2c8a32f2 (diff)
parent44d0cda8efce506c75d9546d2e4de4686bf70d58 (diff)
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp
am: 44d0cda8ef Change-Id: I5bf2282984b9ed40d838cb6ae30c4ab694a8e160
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions