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

* commit '36a590ab365418773c61fef5ffbfec4e641449db':
This commit is contained in:
Mark Salyzyn 2015-08-27 11:54:45 +00:00 committed by Android Git Automerger
commit 7b44fd5e73

Diff content is not available