OSDN Git Service

Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a
authorLorenzo Colitti <lorenzo@google.com>
Thu, 27 Oct 2016 13:38:34 +0000 (13:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 13:38:34 +0000 (13:38 +0000)
commit6f605a4e0f698b18c68ee84693ba2018a00ad590
tree7e1169537ee532a97717dd64c2af0baa4c8b554f
parentc1b04a8b6afd6fd2ca983480c139f7bd5bec3b03
parent57ee5d7e9c4ac4bb700188513ee68aac8e3fc8fb
Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a
am: 57ee5d7e9c

Change-Id: I4f38e704b362fb42c9a8704dee8b1b963008e55e