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