summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android/server/NsdServiceTest.java
diff options
context:
space:
mode:
authorLinzhao Ye <lzye@google.com>2021-05-13 05:48:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-13 05:48:25 +0000
commit8bee21a405b140c9969c40925d5e4c8e7228dbe1 (patch)
tree6ed12a90df56b96f8a3923c580b3cbf82aa57d44 /tests/net/java/com/android/server/NsdServiceTest.java
parent332dd22ff97cac8a5cf1942a5f28447a163c6ab4 (diff)
parentf47925ad3e2a60a39392f1d68c2997a06effc503 (diff)
Merge changes Id9a9451a,Idf113709 am: 03a24f50cc am: 0e751cd213 am: f47925ad3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702072 Change-Id: I483cfc93af04830ff50dfec5bfadf71c7578fd90
Diffstat (limited to 'tests/net/java/com/android/server/NsdServiceTest.java')
0 files changed, 0 insertions, 0 deletions