tree 9f215b5f32ed2e165bd4b849bb4b1f8c2bf71c4f
parent 682e6fc8423812fad3a2436ac74a59f91a2c7e2a
parent e96a44e26ccd6de17cbfabe38613c5b215d9ad56
author Tao Bao <tbao@google.com> 1465921657 +0000
committer android-build-merger <android-build-merger@google.com> 1465921657 +0000

Merge \\\"fs_mgr: Track the bootloader_message struct change.\\\" am: 4d34653720 am: 6f110854ce
am: e96a44e26c

Change-Id: Icbd6307328440c7c615e6af51a6e9ea4945e3d7d