diff options
| author | 2023-08-29 19:24:52 +0000 | |
|---|---|---|
| committer | 2023-08-29 19:24:52 +0000 | |
| commit | cd00f7a7f2b5e00e47947fa69a2ff71c628fc392 (patch) | |
| tree | c7b6a60c82599b60e5f4c8954eea1029e637ae66 /libs/androidfw/AssetManager2.cpp | |
| parent | c5d7c01fa2064f74b0c4e57300b9a0af0c413f5d (diff) | |
| parent | 23529870ac7f1ad98c2e0807498decf611b5ef4c (diff) | |
Merge changes I57de36ba,I75d58e09 into main
* changes:
TrustManagerService: remove ENABLE_ACTIVE_UNLOCK_FLAG
Fix timer bug in TrustManagerService.
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions