| commit | 158beabe1e6827caab8f564f708cdc6ca9b7612f | [log] [tgz] |
|---|---|---|
| author | Jovana Knezevic <jovanak@google.com> | Wed Jun 05 15:59:00 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 15:59:00 2019 -0700 |
| tree | 23a67da6c51b2cf22176de3075214381e990c0d0 | |
| parent | 658fe4a0032852c5033ac5dbb091268e5bc5c7c0 [diff] | |
| parent | c7fc462eb430e75c671069327623e7daa4130f5d [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 am: c7fc462eb4 Change-Id: Ica7f171d057a8e7150fb91b16c7050719bd3f9f1