Hugo Benichi 124b3e7738 Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev ...

am: 9d5f50a9f8

Change-Id: I0236132b8b497af5b1c26aa44e6494fe0510cb6d

2017-10-02 11:10:37 +00:00

..

android/net

Merge "DO NOT MERGE Ignore DUN in describeImmutableDifferences" into oc-mr1-dev

2017-10-02 11:10:37 +00:00

com/android

Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0 am: 0d506fc4f4

2017-10-02 10:51:21 +00:00