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

Skip to content
Commit 115b9c37 authored by Lalit Kansara's avatar Lalit Kansara
Browse files

Merge commit '9bdcff7b' into remote 

Conflicts:
	AndroidManifest.xml
	InCallUI/src/com/android/incallui/Call.java
	InCallUI/src/com/android/incallui/CallButtonPresenter.java
	InCallUI/src/com/android/incallui/NotificationBroadcastReceiver.java
	InCallUI/src/com/android/incallui/StatusBarNotifier.java
	InCallUI/src/com/android/incallui/VideoCallPresenter.java

Change-Id: Ice78377f619bcd740170eff4393102329319f43d
parents 03ebc3fe 9bdcff7b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment