diff options
| author | 2021-01-07 16:31:58 +0000 | |
|---|---|---|
| committer | 2021-01-07 16:31:58 +0000 | |
| commit | 5a5613209d4ccdbd138779ad700873b688b66410 (patch) | |
| tree | ac225ec3a0a90d1685277e4ad91aae7878f4d7c1 /libs/androidfw/ObbFile.cpp | |
| parent | b9ba6a8d0ffbad62dd123d03789ca40acafa4e3a (diff) | |
| parent | 1a0836e3eb76bfefcdb639c3357292affb8c598f (diff) | |
Merge changes Iec22ff63,Iaca8a7cc
* changes:
Stop using VPNs in getDefaultNetworkCapabilitiesForUser.
Inform ConnectivityService about always-on VPN lockdown.
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions