| commit | 5f7c53cfdcc91e0ab7c0869f77bbb32dc5be9ca6 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Sep 12 11:12:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 12 11:12:28 2023 +0000 |
| tree | 6b631776b613cde51b6f6b2223709ce3d5eecbdc | |
| parent | e11277f2dd89c02dfcbc83188dfb3ba33467d295 [diff] | |
| parent | cd6e9e778ebcc7050b025a427204ff4e19599bc6 [diff] |
Merge changes If3217916,I86023b1f into main am: c6dc826c22 am: b2597e6ad5 am: 102b31acf8 am: cd6e9e778e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745020 Change-Id: Ib20a291c06457e3da6811ecf1688fe09fbd97b77 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");