| commit | f5fa85c175e0fc4b38e07c38e34fea7a6cbafd36 | [log] [tgz] |
|---|---|---|
| author | Alan Stokes <alanstokes@google.com> | Tue Aug 29 17:12:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 29 17:12:42 2017 +0000 |
| tree | e9f5bd1ca3a6a1cafc7a77cae2ce90a387ed4f5e | |
| parent | 66bab588b27754c55207a29f29b6045346547614 [diff] | |
| parent | 666ff3688fcbcb7269c262452766e30f4ee272cb [diff] |
Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s." into oc-mr1-dev am: 15e5bd4e2b am: 41f9cc0090 Change-Id: Ib50d2675a81ac08d3a5d772e8f43c922fec431f8