commit | 6abda5654d70f155260d9f36ddf1777b7c090581 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Mon Apr 29 23:46:00 2024 +0000 |
committer | Automerger Merge Worker <[email protected]> | Mon Apr 29 23:46:00 2024 +0000 |
tree | c5cc353ee7a3a786995baf205c1916c783c48b90 | |
parent | e3cf676a391f6a470471728d0bd821bcefc1db25 [diff] | |
parent | 0e94defe5ad93612486d36d2c3335a47af261f43 [diff] |
[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 0e94defe5a -s ours am skip reason: Merged-In If24f59e1f21f054e10f6b9b66195aeadb6d21187 with SHA-1 ce423e9eaf is already in history Original change: https://googleplex-android-review.googlesource.com/c/trusty/app/secretkeeper/+/27145323 Change-Id: I0b726c74122b6f47d0ba014d777d9ac54dec33f6 Signed-off-by: Automerger Merge Worker <[email protected]>