Hugo Benichi 31b86a0a68 Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c am: bc57faa1ac ...

am: 9a3e69d9b6

Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9

2017-05-02 06:49:52 +00:00

..

android/net

NsdManager: unit test coverage for servive registration

2017-05-02 13:31:24 +09:00

com/android

Merge "Add a method to start the captive portal login app." into oc-dev

2017-05-02 04:44:31 +00:00