| commit | 1598fe03b967439bf35ec1c3e9d5d9ea1828cef1 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Mar 13 15:41:59 2017 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Mar 13 15:44:57 2017 -0700 |
| tree | e6bd727ae954d1724401d297aac2589467950884 | |
| parent | 7f454ab30c09f777f8ccdb12b517b0ac74602c1d [diff] | |
| parent | e40a0850959ddb4e1ae24676e30e3cc6cccc807b [diff] |
Resolve merge conflicts of e40a08509 to master Test: gTest liblog-unit-tests logd-unit-tests logcat-unit-tests Bug: 35373582 Bug: 34949125 Bug: 34606909 Change-Id: If6f3f138974913039dd49f2451bad6e413d6e2e1