Hugo Benichi 47834c4698 Merge "Merge changes Ie2676b20,Ie8db6f85 am: f33207512a am: 3b0c20458d am: 7d16886c7e" into oc-mr1-dev-plus-aosp ...

am: 24d8238137

Change-Id: I05671ad4513645fff420cbc9fc4f8355bdeaa1f1

2017-09-15 06:51:45 +00:00

..

android/net

Merge "Network Service Discovery test: properly release resources" am: c9d24d203d am: e7849f69a3

2017-09-04 12:42:56 +00:00

com/android

Merge "Merge changes Ie2676b20,Ie8db6f85 am: f33207512a am: 3b0c20458d am: 7d16886c7e" into oc-mr1-dev-plus-aosp

2017-09-15 06:51:45 +00:00