tree 47597a8ed7135f3155ec3aa2692a9a448bdaf0b4
parent fd845bf09c02289c3b98b1d5f7578af4a6ec9ecc
parent e32af6a22267df09330608abb7a32cb50a7ddd35
author Ken Chen <cken@google.com> 1648698501 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648698501 +0000

Merge "Update data type and comments on tagSocket/untagSocket APIs" am: 6b72346318 am: e32af6a222

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2050124

Change-Id: I2ad173ddded3c865cf78794a5f218cfc8a89c16b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>