Erik Kline aa75fc4ec9 Merge "Support registration of offload control callbacks." am: 7ee96625c2 am: 66cc06c2c7 ...

am: 96c6d201f4

Change-Id: Ie3c4b0929ccf311b4f02fffe0908571cbbb7d772

2017-05-26 10:29:13 +00:00

..

android/net

Merge "NsdServiceInfo: move test to tests/net"

2017-05-25 00:50:27 +00:00

com/android

Merge "Support registration of offload control callbacks." am: 7ee96625c2 am: 66cc06c2c7

2017-05-26 10:29:13 +00:00