Merge "Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4f1175397c" into rvc-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-04-15 17:55:51 +00:00
committed by Android (Google) Code Review

Diff Content Not Available