tree 05ff31a44b186b7b0b80096cdec4c096f5f6afb7
parent 5ad1525e9d667ee6c7d0b19117fb02ea56287a31
parent accb42d1b3fb508c57264f284ee6b4c6216eb888
author Tianjie Xu <xunchang@google.com> 1540441109 -0700
committer android-build-merger <android-build-merger@google.com> 1540441109 -0700

Merge "Add sanity check when loading public keys for OTA package" am: 6793f61795
am: accb42d1b3

Change-Id: I7d66b01eeb8c25339c323d306fc7b8fc4980f9c9