Merge changes from topic 'netd_aosp'

am: d19524f4f2

Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
This commit is contained in:
Lorenzo Colitti
2016-10-27 13:20:34 +00:00
committed by android-build-merger

Diff Content Not Available