Suren Baghdasaryan e460e803c8 resolve merge conflicts of cc628869ff to master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I64216208deb488450567f772eee95540998085a5

2019-12-19 15:46:20 -08:00

..

ims/internal/uce

Move RCS UCE out of Telephony Mainline

2019-12-13 22:17:30 +00:00

internal

resolve merge conflicts of cc628869ff to master

2019-12-19 15:46:20 -08:00

server

Merge changes from topic "overlay-vis-remerge"

2019-12-17 19:06:28 +00:00