Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 am: 2327a3b62a
Change-Id: Iae72ed75125bc3c25acdee5479d55bfa04d393ac
This commit is contained in:
a3460d1831 am: 2327a3b62a
Change-Id: Iae72ed75125bc3c25acdee5479d55bfa04d393ac