tree f82ac15ae695b2cd7b0461e1dd81fbad12124c1d
parent 5bb63befb8ce288a1d31bad4e19c1889fdb3e00d
parent e8c2700519c33a677471c40c466e40a9a2934897
author Hugo Benichi <hugobenichi@google.com> 1495674771 +0000
committer android-build-merger <android-build-merger@google.com> 1495674771 +0000

Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5 am: 1b0f4bf606
am: e8c2700519

Change-Id: I44cae417fcddad72c13938b6fb751de6ed784046