tree 6c0c620b1ce6e0acc01b9bd0ae145800d3be4259
parent 5000349d6248bf36dfb2c7d0abfc7c5d5b800e3e
parent cee383b24f152bc39f9ace416fc8bce0ce01084c
author Oscar Shu <xshu@google.com> 1565295028 -0700
committer android-build-merger <android-build-merger@google.com> 1565295028 -0700

Merge "Revert "[ACTS test] enforce max connection time"" into qt-dev
am: cee383b24f

Change-Id: Ic454b9d4a30f23db8d7f63f4c7600bc3b2b131b7