tree 5afdf0962a78aeeffeb830fea1a645050248b152
parent 205bda070b1f190e8815f2c1dd47219d69a57f37
parent 358573e8a307dd41a9d1d77a5575f62d695facaf
author Treehugger Robot <treehugger-gerrit@google.com> 1642054244 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642054244 +0000

Merge "Add tagSocket/untagSocket NDK APIs" am: d992ee2925 am: 358573e8a3

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

Change-Id: Id17914c8247e754e74c9434a6e6843b703ca2daf