tree f67305610f0cf98f1b780af9d554c7b2e564004d
parent 0d84eaf474f46bc1cccf6c5ce1ea2647c9b96f11
parent 93cf8bb309dde92a97552d39287d7cfc1af0d0cf
author Tianjie Xu <xunchang@google.com> 1539911002 -0700
committer android-build-merger <android-build-merger@google.com> 1539911002 -0700

Merge "Load X509 keys from ziparchive" am: a39b2baf12 am: 81ef25aada
am: 93cf8bb309

Change-Id: I4c7a3bb3e71fa987839f8ef74df76a359c8b336d