am 7b44fd5e: am 36a590ab: (-s ours) am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string"

* commit '7b44fd5e7321473f8a7d3200683c2386395649ea':