Commit a33768dd authored Mar 03, 2021 by Anton Hansson Committed by Automerger Merge Worker Mar 03, 2021

Merge "Revert "resolve merge conflicts of...

Merge "Revert "resolve merge conflicts of a8ebd89c to sc-dev"" into sc-dev am: 9a3362ea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1f5aa17f13bf44c06782b09b50883d2c93ca2f2

packages/SettingsLib/src/com/android/settingslib/Utils.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.location.LocationManager;
		import android.media.AudioManager;
		import android.net.ConnectivityManager;
		import android.net.NetworkCapabilities;
		import android.net.TetheringManager;
		import android.net.vcn.VcnTransportInfo;
		import android.net.wifi.WifiInfo;
		import android.os.BatteryManager;