| commit | 4608b391a0e102b1689f86823221ba6bc77d8da1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:10 2020 +0000 |
| tree | c2ddad1dc129392aa0bb3c2d96f6f0a4feb74c7f | |
| parent | dc6e5d9ecc082f147905c23bb74a1db772369c94 [diff] | |
| parent | eebcd1a3b299083b443d9ba06eee5f3a09d622d7 [diff] |
[automerger skipped] Merge "Merge Android R" am: eebcd1a3b2 -s ours am skip reason: Change-Id I7047e259671193e73f02217afdc57d549e8ca992 with SHA-1 dc6e5d9ecc is in history Original change: https://android-review.googlesource.com/c/platform/system/security/+/1422589 Change-Id: If4c47989ab6bf4ff3a29a9c82e2513c387a30006