tree e9639638cbde293825cba83c010abc38e9c7b23e
parent 42199bf5a06f8efe4aa1d4eac2f917b5ad389511
parent e0a743d035376a5477661b5e7b317b278724c99d
author Hugo Benichi <hugobenichi@google.com> 1500624920 +0000
committer android-build-merger <android-build-merger@google.com> 1500624920 +0000

Merge "IpManagerTest: fix flaky test for real"
am: e0a743d035

Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41