| commit | d1275cef4e6009a7de0b76d02f870e24ef4228c1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:01:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:01:24 2020 +0000 |
| tree | 07e5027a80400a2fc97da192c7e4eda1d6189244 | |
| parent | 83960c4916980385966a048b16cc71901200910d [diff] | |
| parent | c0a6e0bb598bb38ddea9d7dd83251244c9c1720d [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 4b05168d1d am: e2243b37b7 -s ours am: c0a6e0bb59 -s ours am skip reason: Change-Id I3f019cb8929871dfed63f6cae915bccdfa7928f3 with SHA-1 4c0f2da75a is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/1430225 Change-Id: Icb6d15eb0fa34e0b2d984dbb0a4e58f7e4ed8302