tree f82328678920c272d2e46d6b245192f865b1c3dd
parent d4d52756163162f95a2f02dea698e686c973e0f3
parent ecca6ec5335e74cd02ca650e6444bce7ceaa2066
author Vic Yang <victoryang@google.com> 1565231336 -0700
committer android-build-merger <android-build-merger@google.com> 1565231336 -0700

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

Change-Id: I54e76f694fbac10008970dd6e327956a9b684b1d