| commit | 11448df5a1f4f1cc7af766812c6eb815e579e782 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Mon Dec 18 21:57:05 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 18 21:57:05 2017 +0000 |
| tree | 29e49cabe26e9b29cc172ab1d97a716d62e91abb | |
| parent | 6f2f0f639b1745684b88147f5d01a152764ab57f [diff] | |
| parent | 570970f6b2a72e10dcfbb27ad706c41074af3aba [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