tree a29d80528db1a1b45674e306eff7f5f1cd8bd2a4
parent 55416ed3fa562c24c4c7470a6d1227f0812522d0
parent f30f967e5a1c5434f228bf12e13279d51088de9d
author Treehugger Robot <treehugger-gerrit@google.com> 1643819082 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643819082 +0000

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

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

Change-Id: Ibf59d43165b336b52030103a3e9e3b95872197c8