tree f27192cc5e0e1a42c608b5b130b1febf7bb1a23f
parent 4d60bb83bbba14e315daff03169ef64334db2b04
parent f5481a7ea76aea43b99715f95bd39045d5374f28
author Android Build Merger (Role) <android-build-merger@google.com> 1463677246 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463677246 +0000

Merge "DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43  -s ours am: 3c42a21466 am: 4c8e743fa5" into nyc-mr1-dev-plus-aosp