Merge "Add Aware Lock Settings" into qt-dev am: a491cc4cd0 am: 2f4cba2683

am: 3e59404c64

Change-Id: Ie678c2cab5d48375d5c0fbefd7d88031c13c351a
This commit is contained in:
Edgar Wang
2019-05-21 20:54:11 -07:00
committed by android-build-merger

Diff Content Not Available