Lorenzo Colitti 041111ff7e Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev ...

am: 3756636ad6

Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa

2017-07-14 01:01:29 +00:00

..

android/net

IpManager: define InitialConfiguration

2017-07-14 04:26:42 +09:00

com/android

Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev

2017-07-14 01:01:29 +00:00