diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-05 21:47:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 21:47:09 +0000 |
| commit | a248593ba30d21ebe4eecbf9cfdb9f18b0d42401 (patch) | |
| tree | 352bf0d76dfd3cc678a474e08dc4a79a79396ef0 /keystore/java/android/security/KeyStoreSecurityLevel.java | |
| parent | 068119e72c57ffc24506806b2b5a399e30b76930 (diff) | |
| parent | e4ee3249d1869ba4e8c165a9a976ab643e7be636 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser"" into rvc-qpr-dev am: d11f218b8e am: e4ee3249d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462269
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e816ac7b5a7d31aa2aa9fb02d5b37cd20b702bb
Diffstat (limited to 'keystore/java/android/security/KeyStoreSecurityLevel.java')
0 files changed, 0 insertions, 0 deletions