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

Commit cf280d0e authored by Paul Hu's avatar Paul Hu Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of a8ebd89c to sc-dev" into sc-dev

parents 4f507282 03f06070

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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;