tree 72b74227750c302932e2a8f2106979b718fba358
parent be2a9bfe4553f738b125925588171aa5f1cf6603
parent 1b321e43e1378c4f8cb984ee6048c10dddfc86c0
author Tao Bao <tbao@google.com> 1481593525 +0000
committer android-build-merger <android-build-merger@google.com> 1481593525 +0000

Merge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2
am: 1b321e43e1

Change-Id: I8fc5e4d8a55bd67625bc679bc59c323a35f0a4a1