tree 5b1bb5a75f967f86f8c4e60ea628243b32360e7d
parent 5f05698a97ccb783c3aaa38a256d07264203b4ec
parent 6f605a4e0f698b18c68ee84693ba2018a00ad590
author Lorenzo Colitti <lorenzo@google.com> 1477582402 +0000
committer android-build-merger <android-build-merger@google.com> 1477582402 +0000

Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a am: 57ee5d7e9c
am: 6f605a4e0f

Change-Id: I8013cd6a7abe6f1c40c183c3857972dec0679b63