tree c93d4001c5aa39e601f10ce60babdb5a769f1caa
parent 4375704cac8bbfd77c053477c540aabc1ac4d299
parent e858e2fe81d33eab6988ced4319a485ca97370ee
author Vic Yang <victoryang@google.com> 1565230674 -0700
committer android-build-merger <android-build-merger@google.com> 1565230674 -0700

Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79
am: e858e2fe81

Change-Id: If5764dd98d9b45186628f32e7e3a7b470118af23