From: Hugo Benichi <hugobenichi@google.com>
Date: Fri, 21 Jul 2017 08:15:20 +0000 (+0000)
Subject: Merge "IpManagerTest: fix flaky test for real"
X-Git-Tag: android-x86-9.0-r1~411^2^2~5^2~2^2~24
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3d423c9c3965b6c4d9f5e2a23b002ae20d9983a1;p=android-x86%2Fframeworks-base.git

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

Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41
---

3d423c9c3965b6c4d9f5e2a23b002ae20d9983a1