tree 71581affea0fcb88009058fe67263214a6eda5c5
parent 848a32afa9731b53bab74f24f357dff2a6b3b477
parent 9008b2c7df18a01539aa45bcf5d01010ac5d5171
author Tianjie Xu <xunchang@google.com> 1540263360 -0700
committer android-build-merger <android-build-merger@google.com> 1540263360 -0700

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

Change-Id: I8dc25a45464c6f8ddfbd910fbe651f3a2a5211b9