commit | 6487afd8cbb82e9468d150eb5bea6c597d2f70d5 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Sep 07 03:23:07 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 07 03:23:07 2024 +0000 |
tree | 422e1751dfb450d33689a5e2392fdc519ad2efab | |
parent | ff5a2e048bf461e7c59366207f412425a432221f [diff] | |
parent | 8c12f9ff0dbd82348a29e1e9d9a9bc795031f646 [diff] |
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1f87762e32 -s ours am: 8c12f9ff0d -s ours am skip reason: Merged-In I4bae1255764b1687e5db6aec799057ac5612c200 with SHA-1 76311aab2a is already in history Original change: https://android-review.googlesource.com/c/platform/system/security/+/3258597 Change-Id: I67ea66f954f77d5965b6624b2c33846af7eae968 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>