commit | 10bef7e7899db2fbce192b054da0d2caebb8c638 | [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 | 2f52b93cc03c5186bac388b4b9a516ea53fe1aa5 [diff] | |
parent | 2cc226c7b86fe1568b40e9baf9dfccbd2a345340 [diff] |
am ff7230a7: am 1695b846: (-s ours) am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string" * commit 'ff7230a770de55a9431a7298c7687678f1187c23':