Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b
am: e65f7a776d
am: 03b27c3278
am: 25e665eb73
Change-Id: Ia4d5f67ebb14b8c0f3e987f1dc76299a1a789665
This commit is contained in: