OSDN Git Service

Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c59634
authorBenedict Wong <benedictwong@google.com>
Mon, 18 Dec 2017 21:56:41 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Dec 2017 21:56:41 +0000 (21:56 +0000)
am: 826657a9c2

Change-Id: Ia06653e6c1cccddcd2de17dd88a9ef47263f5c79


Trivial merge