diff options
| author | 2023-09-22 13:39:58 +0000 | |
|---|---|---|
| committer | 2023-09-22 13:39:58 +0000 | |
| commit | c754bea8f575c57e6b5191d2c2a15b84dcf78aba (patch) | |
| tree | 5413ec9b5103b53bc42f24cc7f94e8236a86a0ab /libs/androidfw/AssetManager.cpp | |
| parent | 19dafeb60c37a0bd2ed122388c70cf9c57e8a011 (diff) | |
| parent | 0b49f269323f46ff5b220465eb51152a58a3ff81 (diff) | |
[automerger skipped] Merge "Fix attestation properties reading logic" into udc-qpr-dev am: 0b49f26932 -s ours
am skip reason: Merged-In I9af7daa08cbd8bb52f3509fe93f787ba94b7bbc3 with SHA-1 316e3d16c9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24707494
Change-Id: Ie9ac72c945e0a8400ad1aed2f5682a521ae75bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions