| commit | bad4e311719d158783baab61f5ffadddead73d6f | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Aug 27 11:54:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:45 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | d9152e14993f0d1cc75282d9e2fbfb56f6172e7a [diff] | |
| parent | 68e3375e6dfcd51d546caaf1bc6abc02e455037d [diff] |
am 36a590ab: (-s ours) am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string" * commit '36a590ab365418773c61fef5ffbfec4e641449db':