tree 07e5027a80400a2fc97da192c7e4eda1d6189244
parent 51d039065ed79d5c55b8bc09b83a5d9d8a5db2cb
parent d1275cef4e6009a7de0b76d02f870e24ef4228c1
author Bill Yi <byi@google.com> 1600502519 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502519 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 4b05168d1d am: e2243b37b7 -s ours am: c0a6e0bb59 -s ours am: d1275cef4e -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: I7eac7991ec6390366ff5b4502b7e5a96e3d95bbc