commit | 21e846127fe85733e5ffe06f0daa76f746bb90d6 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 07 23:20:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 07 23:20:48 2020 +0000 |
tree | 3ab89552ecac71c1869c64c7204f36d80366497d | |
parent | 887278ae6d3291de4f5122a2bcf43da9002f8190 [diff] | |
parent | d4b22e9e7ce61c3ac060a92702ec7f09951e1b0d [diff] |
Merge "Revert "Revert "Make SW keymaster security level configurable""" into qt-qpr1-dev-plus-aosp am: d4b22e9e7c Change-Id: Ia6404bd33013278daaa776cbb6dd546d9de4db36