| commit | 1c8887c2eed1a49399146f767b8af01438446fff | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 09 16:42:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 16:42:38 2023 +0000 |
| tree | 32c7217645b76ac27495c0299759d8d53c248e2e | |
| parent | 9e1b57a2c2222f6281d11bc1666f1d08a51fcb1e [diff] | |
| parent | ac0a2958afca4635a4c747b3025c6465cf49d9e5 [diff] |
Merge changes If33414ec,I8f211e47,If05c0c53 into main am: ae0971b4ae am: d5b0dbd5a7 am: a774477a4e am: ac0a2958af Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776122 Change-Id: I7ac06bb1ecf2a2208a7188dbd137aaae805c3019 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");