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

Browse Source

am: 11448df5a1  -s ours

Change-Id: I3289c409e2014c898cba8ba14768ea174937ffed

...

This commit is contained in:

Android Build Merger (Role)

2017-12-18 22:14:52 +00:00

committed by android-build-merger

parent 1c48aea609 11448df5a1

commit 06cac97a3a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available