tree 79f3b19e31ab15072c610c605aa009244db8cc4a
parent d4ceb1fb64d4e4e36a884a159cf5904f1faa00bb
parent f4fabe254c576d53c7634b5569eae1853da3fa07
author Tao Bao <tbao@google.com> 1481323427 +0000
committer android-build-merger <android-build-merger@google.com> 1481323427 +0000

Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d
am: f4fabe254c

Change-Id: I8cde0f335ff2c2a496f497d744ffc6a94ea832b7