| commit | 885e674a335727fc8aec7fdbe35590bd4efe9765 | [log] [tgz] |
|---|---|---|
| author | Kangping Dong <wgtdkp@google.com> | Tue Sep 19 13:07:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 19 13:07:25 2023 +0000 |
| tree | 72c017504b10fbe2f08d710a57bdd65b95188911 | |
| parent | 59b60b4d1868684ffaef2e6a7f9b0ff5d104b7e1 [diff] | |
| parent | 0d1e18abc8f8b69d0a1d7689e9d27fd1aaf07683 [diff] |
Merge "[Thread] initial Thread network service" into main am: 01e6dadd1f am: e5f1122ec9 am: 9cdab0fd28 am: 0d1e18abc8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2721333 Change-Id: I1e8d7e274d3c80e1e2ff881b934249a15bdf158c 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");