tree 5ff485195778be142247cff8f26056b6c21d89c5
parent bd36ae8e18caa694653de3cce15f76efaa21c6ba
parent 774011e8a7b01aa33f95ccd8528dc0cb6153e873
author Bharath <bharath@fairphone.com> 1652285094 +0530
committer Bharath <bharath@fairphone.com> 1652287316 +0530
mergetag object 774011e8a7b01aa33f95ccd8528dc0cb6153e873
 type commit
 tag android-security-11.0.0_r54
 tagger The Android Open Source Project <initial-contribution@android.com> 1649115445 -0700
 
 Android security 11.0.0 release 54
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYkuBNQAKCRDorT+BmrEO
 eCoqAJ4igXVIwvS85ePs/lTS6pehWSrP7wCfZOwoqN9XbkvyZBK9vYpEimutaHA=
 =T5h6
 -----END PGP SIGNATURE-----

Merge tag 'android-security-11.0.0_r54' into int/11/fp3

Android security 11.0.0 release 54

* tag 'android-security-11.0.0_r54':
  Allow adbd to access /proc/net/{tcp,tcp6,udp,udp6}

Change-Id: I253358fcc041cdd0c4e54fcd207540686f40f984