tree 71581affea0fcb88009058fe67263214a6eda5c5
parent 3463839772581875057a951f9b54837a825b8c40
parent bfc7d43c0049b6177588f7c65feffd80385dd706
author Tianjie Xu <xunchang@google.com> 1540263085 -0700
committer android-build-merger <android-build-merger@google.com> 1540263085 -0700

Merge "Recovery now expects public keys in zipfile"
am: bfc7d43c00

Change-Id: Iafcfe9a2497803c794327ee5c8bf9b6e1a8e5e8f