| commit | fd1ed62f81d64c3b19a82c024c758b817b9bf4e0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 14 20:38:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 14 20:38:05 2023 +0000 |
| tree | 8daf651c4d052a21c15c6ccf09ee1fbd2e673939 | |
| parent | d2335496cf6ea2098a1cf3a6f2c8ebab860dd991 [diff] | |
| parent | e68739d975916850d3acb156458499441a2fa280 [diff] |
Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5 am: b41a17a4f4 am: d412e5cb56 am: e68739d975 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676841 Change-Id: I7e3b98c6db8f72867f36868bd6b7ac975a161c10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java b/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java index 39bc60b..54264f7 100644 --- a/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java +++ b/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java
@@ -22,7 +22,6 @@ * Constants for Nearby Presence operations. */ public class PresenceConstants { - /** Presence advertisement service data uuid. */ public static final ParcelUuid PRESENCE_UUID = ParcelUuid.fromString("0000fcf1-0000-1000-8000-00805f9b34fb");