Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee

am: 7e80654f56

Change-Id: I860520d24575bd80a93cac175b7941ee6c7685b9
This commit is contained in:
Jovana Knezevic
2019-06-05 15:31:08 -07:00
committed by android-build-merger

Diff Content Not Available