tree cad5f87bce87c1e90bbe3715efe430cdf23ef85a
parent 67b881b2b005d5b7f1917f87797f6d4bc157bac7
parent ec89ba1558800cdc7ee9e6e17f19ee0842e7e827
author Florian Mayer <fmayer@google.com> 1520886086 +0000
committer android-build-merger <android-build-merger@google.com> 1520886086 +0000

Merge "Fix CPU spinning on failed connection attempt." am: 717fb57456 am: e576c9cfaa
am: ec89ba1558

Change-Id: Id5030d91e2c1bf971af3c4051f00d7e1473f6a5a