commit | c7fc462eb430e75c671069327623e7daa4130f5d | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Jun 05 22:31:56 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 05 22:31:56 2019 +0000 |
tree | 12a51c3070f081bd41b2f22969ea766594d27c49 | |
parent | bdf9b7018eb1aef2a0943ea8ce336dd48971759d [diff] | |
parent | ecb54c56b510faab5fc4cecbf964cd1dc3d021b8 [diff] |
Merge "Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee am: 7e80654f56" into qt-r1-dev-plus-aosp