commit | b6267a59fea10b79b3df0e54d1093588d7d33827 | [log] [tgz] |
---|---|---|
author | Maarten Derks <maarten@fairphone.com> | Thu Mar 03 13:38:45 2022 +0100 |
committer | Maarten Derks <maarten@fairphone.com> | Thu Mar 03 13:38:45 2022 +0100 |
tree | 691a5fd9185b11b0e49e7a93a67a509cd68f9b11 | |
parent | a60ed97edc31319b8155cbe60196df4e649cabd6 [diff] | |
parent | dea392aa1bf8e532758cc1e6cc5f6a8b3fcc0de9 [diff] |
Merge branch 'security-aosp-qt-release' into int/10/fp2 * security-aosp-qt-release: Allow adbd to access /proc/net/{tcp,tcp6,udp,udp6} Change-Id: I41f44356e1911938445c6fd85d3e18e413c7c920