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

Commit d47ee817 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

resolve merge conflicts of 0d5cae00 to stage-aosp-master 

am: 822fe2a1

Change-Id: I61c82f0834c9b75d08c1d0a2a03a43d4ed92d048
parents 09620827 822fe2a1

tests/src/com/android/server/telecom/tests/TelecomSystemTest.java

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import com.android.server.telecom.CallerInfoAsyncQueryFactory; 
import com.android.server.telecom.CallerInfoLookupHelper;

import com.android.server.telecom.CallsManager;

import com.android.server.telecom.CallsManagerListenerBase;

import com.android.server.telecom.ContactsAsyncHelper;

import com.android.server.telecom.HeadsetMediaButton;

import com.android.server.telecom.HeadsetMediaButtonFactory;

import com.android.server.telecom.InCallWakeLockController;