OSDN Git Service

Merge "Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 18 Dec 2017 22:15:26 +0000 (22:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 18 Dec 2017 22:15:26 +0000 (22:15 +0000)
commit5e7017b548a1c4a629b40ab375d198b8ee17b1ce
tree5e30397f98c2ac40649466296bf218d12c9fdeb7
parent91a92b9a7a6604dc3e5087e0d01333d6247aae48
parent06cac97a3aef14fc0a30df67231ee45197c989c1
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"