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

Commit d1bc8525 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "DevicePolicyManager: ignore invalid proxy settings" into tm-dev am:... 

Merge "DevicePolicyManager: ignore invalid proxy settings" into tm-dev am: e4d17b17 am: ae2e3b7e am: d5085195 am: 67969b1e

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



Change-Id: Ib165775b52fad171771e1a41ff9c078878c478a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d1b4bb2 67969b1e
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