Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff
am: cc2652c5e9
am: 72f55ee81c" into rvc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
4097433543