tree c2ca3bc49811fed1bb8cf04deee7af5d16266fae
parent d30c9c99927d8e4794cd09be1c19b72e5378b902
parent 4bc8cb7628c39324e02972fae17daa6de6e86a7a
author Treehugger Robot <treehugger-gerrit@google.com> 1643820301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643820301 +0000

Merge "Really expose the new NDK socket tagging functions added in T." am: cba72fc987 am: fd5bb81c8a am: f30f967e5a am: 4bc8cb7628

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1967301

Change-Id: Ia93a3556b209aa214233952b838c2e0ca3aeaddb