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

Commit 985ab41c authored by Ihab Awad's avatar Ihab Awad Committed by Natiq Ahmed
Browse files

Telecom API updates (1/6)

Bug: 18292176

Conflicts:
	telecomm/java/android/telecom/Conference.java
	telecomm/java/android/telecom/Connection.java
	telecomm/java/android/telecom/ConnectionService.java
	telecomm/java/android/telecom/ParcelableConference.java
	telecomm/java/android/telecom/ParcelableConnection.java
	telecomm/java/android/telecom/PhoneAccount.java
	telecomm/java/android/telecom/PhoneCapabilities.java
	telecomm/java/android/telecom/RemoteConference.java
	telecomm/java/android/telecom/RemoteConnection.java
	telecomm/java/android/telecom/RemoteConnectionService.java

Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
parent 1807559c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment