| commit | 2cc226c7b86fe1568b40e9baf9dfccbd2a345340 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Aug 27 11:54:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:49 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 8209e39e9904f78e2c4fdfd436f909b8268d6f79 [diff] | |
| parent | 380683564e4296ab0537e377ed0400e0f9609511 [diff] |
am 1695b846: (-s ours) am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string" * commit '1695b8464dda219b717adfb40a95bd5e34cd4da3':