diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-22 15:06:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 15:06:48 +0000 |
| commit | 733e8146b22d28ade436fa8895603c3feee87c0a (patch) | |
| tree | 3a4b4a07957d7438c5f075299ad9a33abe74a2b9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 41767eb37dc0d8116cc0e9dd030b7fc9a8d8e870 (diff) | |
| parent | b586b99ba90c4b93cf64a72f2e2d27bf1b7a48e7 (diff) | |
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -s ours am: 3d98d21ffd -s ours am: 6cebb467c1 -s ours am: b586b99ba9 -s ours
am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 1a5e45e37d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428
Change-Id: I6394837b091235a5deaa708d17f2049de01b9403
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions