tree 25401f3bba259da2fe8f0336c664a8c62a151b8d
parent 0e0ce6ca6c8b21a3ed08eaf179ebe6fc7b4c1976
parent 4d346537208189d05f34a44212cfc02200bcd5a0
author Tao Bao <tbao@google.com> 1465921105 +0000
committer android-build-merger <android-build-merger@google.com> 1465921105 +0000

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

Change-Id: I0590289d189d33c7844e8fd15cdd2df341dae7c4