Lorenzo Colitti cdbf1e7545 Merge "ConnectivityServiceTest: remove flaky waitForIdle test." ...

am: be80577f5b

Change-Id: I444746af6adc7be4a3f69243379f65aadf29ea19

2017-01-27 09:47:05 +00:00

..

CoreTests/android/core

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -07:00

net/java/com/android/server

Merge "ConnectivityServiceTest: remove flaky waitForIdle test."

2017-01-27 09:47:05 +00:00