| commit | e6ea9f1297859512b78ea0ac223a290c7d1b6c54 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 09 10:02:54 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:02:54 2022 +0000 |
| tree | 87562ee0d8b47edfb944004f7c343ef690b9744e | |
| parent | 9bd8e8de0f90989f0cbc1ed1d6b78c78f5012aa0 [diff] | |
| parent | 875cd4dcf6bf5d8aa60db4650442785a50f5fcf9 [diff] |
[automerger skipped] Merge Android 12L am: aab806354f -s ours am: d2e57b7dac -s ours am: 875cd4dcf6 -s ours am skip reason: Merged-In I8bbf321498d25aca1d427d930dba0204391f704b with SHA-1 62f2bd0e41 is already in history Original change: https://android-review.googlesource.com/c/platform/system/security/+/2012746 Change-Id: Ic2188d8998347d384a328e6f4acc8a658c1526ab