tree e36695d2ca8745e2e919d3f22d7604efbca094c4
parent 5aecae499c6cf57af4c3649b15dfcc99f9cd472e
parent 8bf8d82d8803689e6ebefa0218720351508827f9
author Edward Savage-Jones <edward.savage-jones@sonymobile.com> 1485876836 +0000
committer android-build-merger <android-build-merger@google.com> 1485876836 +0000

Merge "Fix CTS test case failure test_isReachableLjava_net_NetworkInterfaceII" am: c48bfa3c5a am: 690fe3c15b am: 03136d3599
am: 8bf8d82d88

Change-Id: Ie8e8d21a6647c10ffc73f4c252a83a8057612e9d