tree 48baf5665e9f851a199752e47212c522cebb8ac7
parent 584d1f242289dfb5f5c3e80725fffe1dd5145805
parent d0ecbfb729709d87256f751d4fc34981a2ee327b
author Tao Bao <tbao@google.com> 1481324059 +0000
committer android-build-merger <android-build-merger@google.com> 1481324059 +0000

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

Change-Id: Ib79be43f638a5389181bce5d983b2e406ed36511