Merge "Add Aware Lock Settings" into qt-dev am: a491cc4cd0
am: 2f4cba2683
Change-Id: I9e613098e1697f639ae9a0f2c32f615ce86ab00e
This commit is contained in:
a491cc4cd0
am: 2f4cba2683
Change-Id: I9e613098e1697f639ae9a0f2c32f615ce86ab00e