tree d8b4d18467a72efbeeccd8ff362392bb1b0a5d2f
parent 6af43e5d6fe1cfedc182094e46d2828fd121d044
parent 27b0eebb4d8257dd3851a88dc73b3fbeefc0a6b3
author Hugo Benichi <hugobenichi@google.com> 1493715899 +0000
committer android-build-merger <android-build-merger@google.com> 1493715899 +0000

Merge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c am: 60182dbe4e
am: 27b0eebb4d

Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c