| commit | 6b344a8db6deb6ecafad3bbb8599fe7a540d60f5 | [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 | 9fa97789bc30372c91817d3b62cc526b84fa967b | |
| parent | 8333779dee55d967bc1bbb4fc7b1d07922add0db [diff] | |
| parent | 640c78f546134f54b834e04725c8a9691c9f7043 [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