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

[Settings] Code refactor - remove unused import lines

2021-03-16 10:24:24 +00:00

ImsQueryProvisioningStat.java

[Settings] Code refactor - remove unused import lines

2021-03-16 10:24:24 +00:00

ImsQueryTtyOnVolteStat.java

[Settings] Code refactor - remove unused import lines

2021-03-16 10:24:24 +00:00

ImsQueryVtUserSetting.java

[Settings] Code refactor - remove unused import lines

2021-03-16 10:24:24 +00:00

ImsQueryWfcUserSetting.java

[Settings] Code refactor - remove unused import lines

2021-03-16 10:24:24 +00:00

IntegerConsumer.java

…

VolteQueryImsState.java

…

VtQueryImsState.java

…

WifiCallingQueryImsState.java

…