| commit | bf09f85b9d45e719ab35aec961ae773132486ff4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 01:48:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 01:48:52 2021 +0000 |
| tree | 46f71694eee8143eaeb2d81ec9dd737a6cbf71a6 | |
| parent | 7dbcae5f34d45b83528543b3fe43825c19c150f3 [diff] | |
| parent | 825af81c42db63eedc244df7e05c176e38eda075 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 825af81c42 -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: I98ac2572b91a88c162942ba86defe601639bc13d