diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-22 15:06:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 15:06:22 +0000 |
| commit | 41767eb37dc0d8116cc0e9dd030b7fc9a8d8e870 (patch) | |
| tree | 3a4b4a07957d7438c5f075299ad9a33abe74a2b9 /rs/java/android/renderscript/ProgramStore.java | |
| parent | b86bfd4109f2c60d967586da53bf6bacdd1c9b78 (diff) | |
| parent | 72ab6c2bc40bdf4303a738c038d991daa25bbe0a (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: 72ab6c2bc4 -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: I6b42c79d759be41e29f0a3c8375563adffe5329c
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions