diff options
| author | Joshua Duong <joshuaduong@google.com> | 2021-05-13 20:39:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-13 20:39:50 +0000 |
| commit | 791f0884367871f25fabb54334dc318edf46b39e (patch) | |
| tree | beda239a76a890324bd273e4428d31d958455b78 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9853e8a94e45ce82b0295d54afd6b199cd619e48 (diff) | |
| parent | bc9360ea4eb3b17ba28a72b1898694f528b00ef0 (diff) | |
Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34 am: bc9360ea4e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705645
Change-Id: I835c98cbed1be7f90d0c57b25d16cf0bda36b3b1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions