| commit | 06cac97a3aef14fc0a30df67231ee45197c989c1 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Mon Dec 18 22:14:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 18 22:14:52 2017 +0000 |
| tree | 9c30a61b390bb8583c032efaa631926cf99bf6e8 | |
| parent | 1c48aea6098ba63e640c1f57834324a9a3ec594c [diff] | |
| parent | 11448df5a1f4f1cc7af766812c6eb815e579e782 [diff] |
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