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

Commit f690ee19 authored by Conley Owens's avatar Conley Owens
Browse files

Merge commit 'ddf58791' into m 

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
	src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

Change-Id: Ib3533b9713373c84636940dbe3e41203898aef46
parents 0633e1d6 ddf58791
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment