| commit | c67f13937e45f38b15f8927ee6fb28cb18de9a30 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Aug 27 14:37:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:37:13 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 60ef4a12b5dab0b41efbc7e9479fa81069eac5bf [diff] | |
| parent | ff7230a770de55a9431a7298c7687678f1187c23 [diff] |
am ff7230a7: am 1695b846: (-s ours) am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string" * commit 'ff7230a770de55a9431a7298c7687678f1187c23':