tree 9c30a61b390bb8583c032efaa631926cf99bf6e8
parent 1c48aea6098ba63e640c1f57834324a9a3ec594c
parent 11448df5a1f4f1cc7af766812c6eb815e579e782
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1513635292 +0000
committer android-build-merger <android-build-merger@google.com> 1513635292 +0000

Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634 am: 826657a9c2" into oc-mr1-dev-plus-aosp
am: 11448df5a1  -s ours

Change-Id: I3289c409e2014c898cba8ba14768ea174937ffed