Merge "add conversation flags to channel atom" into rvc-dev am: 1d867453ca am: 1f9f62fe1a
Change-Id: Ic118b7685899857a7c552885095b4ca8d4d474fb
This commit is contained in:
1d867453ca am: 1f9f62fe1a
Change-Id: Ic118b7685899857a7c552885095b4ca8d4d474fb