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

Change-Id: I2279876026acbbe0de65e908887dd210b9ee3284
This commit is contained in:
Alan Stokes 2017-08-29 17:01:16 +00:00 committed by android-build-merger
commit 41f9cc0090

Diff content is not available