| commit | 5e7017b548a1c4a629b40ab375d198b8ee17b1ce | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Mon Dec 18 22:15:26 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 18 22:15:26 2017 +0000 |
| tree | 5e30397f98c2ac40649466296bf218d12c9fdeb7 | |
| parent | 91a92b9a7a6604dc3e5087e0d01333d6247aae48 [diff] | |
| parent | 06cac97a3aef14fc0a30df67231ee45197c989c1 [diff] |
Merge "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"