diff options
author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /logd/LogReader.h | |
parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'logd/LogReader.h')
-rw-r--r-- | logd/LogReader.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/logd/LogReader.h b/logd/LogReader.h index b85a58478..a4e52c4eb 100644 --- a/logd/LogReader.h +++ b/logd/LogReader.h @@ -22,8 +22,6 @@ #include "LogReaderList.h" #include "LogReaderThread.h" -#define LOGD_SNDTIMEO 32 - class LogReader : public SocketListener { public: explicit LogReader(LogBuffer* logbuf, LogReaderList* reader_list); |