Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59 am: 2dc9e9ad76 am: 7afa4dd1be am: 0f90b09ea0 am: 432bf592bc
Change-Id: I2cc91c99bcec25afb16f8cc3846e07b3be8a61e6
This commit is contained in: