tree 12e829264c6cc6e2f29e5c34a99499307d8e5622
parent c0044e9f89f626ef4983df219967117b714dcfc8
parent c025f145cbbf50adc567cb94656ad659695d9d51
author Tao Bao <tbao@google.com> 1483487527 +0000
committer android-build-merger <android-build-merger@google.com> 1483487527 +0000

Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5
am: c025f145cb

Change-Id: I870949d42264520f3f9863aea07e26118865ac44