| commit | 58700fc4f9441864bc79b475488863c59a62af43 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Mon Oct 09 20:01:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 20:01:40 2023 +0000 |
| tree | 253f1828bb6d4893c0654c1e4c922d62770036af | |
| parent | 1c8887c2eed1a49399146f767b8af01438446fff [diff] | |
| parent | 9ad779085a2129378a03fbd9d44f30eab3b31b32 [diff] |
Merge changes Ib48cc2b8,I3f0a12f1 into main am: 2c2c707d6c am: fc919f3d7b am: 89175347d5 am: 9ad779085a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2778286 Change-Id: I725c1e5617c602e170c8f581a6bb5dbe92c73504 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");