diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-22 14:28:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 14:28:08 +0000 |
| commit | 3d98d21ffdee282e3fec56f8a003032206e4c1e9 (patch) | |
| tree | e68b33c05fd7c7f1514f2fe52f2378e4e4b74a98 /tools/aapt2/java/ClassDefinition.cpp | |
| parent | 17a684fff47c1aa9b0f1c6e1f56137e2ef7396a9 (diff) | |
| parent | b3d84ac6dd094aa59fe49a9b8aadf19714a932bb (diff) | |
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -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: I8c9e94f26b3fd0d72e718fc39d5047604b741868
Diffstat (limited to 'tools/aapt2/java/ClassDefinition.cpp')
0 files changed, 0 insertions, 0 deletions