| commit | 2f52b93cc03c5186bac388b4b9a516ea53fe1aa5 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Aug 27 14:37:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:37:11 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 123a9859cccbeee417a6fa52c12fa289bf0bda62 [diff] | |
| parent | 8209e39e9904f78e2c4fdfd436f909b8268d6f79 [diff] |
am d9d21cb7: am d52484c7: (-s ours) am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string" * commit 'd9d21cb74ccc54276d59201848458daf0200fd1f':