OSDN Git Service

Merge "Minor fixes for netd restarts and StrictController." am: 2f5ca257b5 am: 25e0f60f54
authorLorenzo Colitti <lorenzo@google.com>
Wed, 9 Aug 2017 18:14:03 +0000 (18:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 18:14:03 +0000 (18:14 +0000)
commit470d1c721a53fc2891c5ee05a7a928d6f1c0f17d
treee00a150571bec32442e8e19f2e51c0b02fef5fad
parent6179997bb90ab7e6f1f89b784ddb2c69d9216875
parent685aa45e4b6abee7904d6bc5ae5022a7372703af
Merge "Minor fixes for netd restarts and StrictController." am: 2f5ca257b5 am: 25e0f60f54
am: 685aa45e4b

Change-Id: I5b72057e337de73d1e4bdbf22fbdd0c45a61d344