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

Skip to content
Commit 4083e594 authored by Rambo Wang's avatar Rambo Wang
Browse files

resolve merge conflicts of 5a104286 to master 

Bug: None
Test: atest com.android.internal.telephony.TelephonyRegistryTest
Test: atest android.telephony.cts.PhoneStateListenerTest
Change-Id: Ibd9b67ce9be1d8ad718da45d494fc2bfe75f0959
parents b5ebb176 5a104286
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