Janis Danisevskis 5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev ...

Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e

2021-03-17 19:09:29 +00:00

..

BooleanConsumer.java

…

ImsQuery.java

…

ImsQueryController.java

…

ImsQueryEnhanced4gLteModeUserSetting.java

…

ImsQueryProvisioningStat.java

…

ImsQueryTtyOnVolteStat.java

…

ImsQueryVtUserSetting.java

…

ImsQueryWfcUserSetting.java

…

IntegerConsumer.java

…

VolteQueryImsState.java

…

VtQueryImsState.java

…

WifiCallingQueryImsState.java

…