Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74536c50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[SettingsProvider] Add maxTargetSdk=S to... 

Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev am: 64b875e1 am: 454aaa44

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730032



Change-Id: I190588c6c5320882f5c0c3525af18e71cf773cb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75c9a38c 454aaa44
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment