| commit | 729f6bec05ac8c514901de04358428602d07fc98 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 02:37:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 02:37:03 2021 +0000 |
| tree | 46f71694eee8143eaeb2d81ec9dd737a6cbf71a6 | |
| parent | d1d4d34dc0f0fb4542360754bb03683a798716d6 [diff] | |
| parent | fa5e512acd11a669310795381ce504470e59b3ff [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 825af81c42 -s ours am: bf09f85b9d -s ours am: fa5e512acd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/system/security/+/1700271 Change-Id: Ibd68d5ad46edcc75a40a02629000c64d01573006