am d9d21cb7: am d52484c7: (-s ours) am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"

* commit 'd9d21cb74ccc54276d59201848458daf0200fd1f':
This commit is contained in:
Mark Salyzyn 2015-08-27 14:37:11 +00:00 committed by Android Git Automerger
commit 60ef4a12b5

Diff content is not available