tree 71581affea0fcb88009058fe67263214a6eda5c5
parent 3d5a941b0b1671c3ccc3dd25faa2cd7de738b0b0
parent 10c9282e0797b7edbe324d27f8fb6d48d134ab00
author Tianjie Xu <xunchang@google.com> 1540263621 -0700
committer android-build-merger <android-build-merger@google.com> 1540263621 -0700

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

Change-Id: I7954d85378ff4616c1127dfe2b3e82b0d69b4e5e