Erik Kline b912c50b19 resolve merge conflicts of 9e6b6e2a58 to oc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3

2017-06-20 22:04:32 +09:00

..

android/net

Fix race condition in NsdManagerTest

2017-05-31 15:35:54 +09:00

com/android

resolve merge conflicts of 9e6b6e2a58 to oc-dev-plus-aosp

2017-06-20 22:04:32 +09:00