tree 4bbd5318f2d9b282d68bd115f2d611d193b7ce4b
parent 4bbe8cc1af2b0686588b9f58a4efbf5ab92d2eac
parent 95872aa3d1063aaf67d0cfc46a6d953fb214a41e
author Lorenzo Colitti <lorenzo@google.com> 1544438727 -0800
committer android-build-merger <android-build-merger@google.com> 1544438727 -0800

Merge "Increase the IpClientTest timeouts to reduce flake rate." am: 4e780bd992 am: db3380c87f
am: 95872aa3d1

Change-Id: I645c9fa2b0c9ab234c19a47c9dd09bf132bbe06b