tree 6f3abc9f6562c47604fb5eef174f9291b2231438
parent e26d1bd6cd9ad2f77f0856ac697f796a8802818d
parent 6f110854ce6697065f9631c51e95ff7cbc01376e
author Tao Bao <tbao@google.com> 1465921379 +0000
committer android-build-merger <android-build-merger@google.com> 1465921379 +0000

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

Change-Id: I45831ba35a17b68afd3adda55120e78f6a10779d