diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-22 14:52:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 14:52:31 +0000 |
| commit | 72ab6c2bc40bdf4303a738c038d991daa25bbe0a (patch) | |
| tree | 86a780421b6819cb219e58d2630ab2179cc2ceb4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fc1c6b187da2f22e1c0b82a3898304d610fa3cca (diff) | |
| parent | 6c5572854548787d920ba0d203ee1c3adce78567 (diff) | |
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd am: b677954b08 -s ours am: 6c55728545 -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: Ib37a0e74c92305a3e52f152b586a84fc9d0c57e4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions