commit | 51d039065ed79d5c55b8bc09b83a5d9d8a5db2cb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:05 2020 +0000 |
tree | 07e5027a80400a2fc97da192c7e4eda1d6189244 | |
parent | bab097cfe05084e112a0c32de40e231f0f9ca809 [diff] | |
parent | 83960c4916980385966a048b16cc71901200910d [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 7c9d3186d0 am: e8087cb78a -s ours am: d5a3518988 -s ours am: 83960c4916 -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: I708a6bb94586fa2f5104786402b304932c6cb801