resolve merge conflicts of d42d9a41f6
to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
This commit is contained in:
@@ -18,7 +18,6 @@ package com.android.settings.sim;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.telecom.PhoneAccount;
|
||||
import android.telecom.PhoneAccountHandle;
|
||||
import android.telecom.TelecomManager;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
|
Reference in New Issue
Block a user