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

Commit 78dd2054 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 4cae974a: Merge commit \'c93ffd4a\' into fix-merge-conflict 

* commit '4cae974a':
  Add SubscriptionController dump.
parents 5bf6757a 4cae974a

src/java/com/android/internal/telephony/DebugService.java

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.internal.telephony;



import android.telephony.Rlog;

import android.telephony.SubscriptionManager;



import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.IccCardProxy;

src/java/com/android/internal/telephony/SubscriptionController.java

+177 −70

File changed.

Preview size limit exceeded, changes collapsed.