tree f67305610f0cf98f1b780af9d554c7b2e564004d
parent 6abcee3efe20b59b89230d2b6faa723a7df9354d
parent 81ef25aada67efb2159e32bbf9515bf2e6bf9f69
author Tianjie Xu <xunchang@google.com> 1539910757 -0700
committer android-build-merger <android-build-merger@google.com> 1539910757 -0700

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

Change-Id: I556873f4ce2c68d6265070dc1dce2972760f9397