| commit | fa5e512acd11a669310795381ce504470e59b3ff | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 02:13:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 02:13:45 2021 +0000 |
| tree | 46f71694eee8143eaeb2d81ec9dd737a6cbf71a6 | |
| parent | 50ec1caea4a8d7d4d659c2d0e9601369d904980d [diff] | |
| parent | bf09f85b9d45e719ab35aec961ae773132486ff4 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 825af81c42 -s ours am: bf09f85b9d -s ours am skip reason: Merged-In I001adb29a4c064620c648f8670690b900265cb8a with SHA-1 3cba10d360 is already in history Original change: https://android-review.googlesource.com/c/platform/system/security/+/1700271 Change-Id: I5cefc22d13addc376119cee411f1bf8bec0a7e34