| commit | 5a49671d6d8d3fa6aa445407aacef6b69620cf0d | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Sep 13 02:52:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 02:52:05 2023 +0000 |
| tree | cef1bcbb520e7ef64f0502449533b422b959d0f0 | |
| parent | 68f5f1bb2d991fd1af39745d7d72675d48e24c4b [diff] | |
| parent | 2f933f4df77d527c095bf84ec9714a0a9dcd3c1e [diff] |
Merge "netd.c - nettrace - add support for icmp type/code & udplite/sctp ports." into main am: f10d3af3d4 am: 0bcf94dbc7 am: 6f66e7a368 am: 2f933f4df7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2747115 Change-Id: I642674ed1f7cec7d83def9c62c2a372dad455683 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");