diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-22 14:41:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 14:41:14 +0000 |
| commit | 6c5572854548787d920ba0d203ee1c3adce78567 (patch) | |
| tree | 86a780421b6819cb219e58d2630ab2179cc2ceb4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e760b2ce986fdc9b4886ef412ecb49bee1ab233c (diff) | |
| parent | b677954b08c3388397cbd96d5828ef970f5b43e8 (diff) | |
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd am: b677954b08 -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 6a49d466d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428
Change-Id: I8c007e82bb1f6c53c98678f2c3667dc615fdb6ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions