tree e75b92929d53f83f86860e2ef4d8bf043c6fdebf
parent 7f5e29b255c1e06f679eecacbde8f26488ca512e
parent d521a6d1467a41ba20744f63dd70a40be0f35be0
author bohu <bohu@google.com> 1462757862 +0000
committer android-build-merger <android-build-merger@google.com> 1462757862 +0000

Merge "Ensure Netd Service is alive" into nyc-dev
am: d521a6d146

* commit 'd521a6d1467a41ba20744f63dd70a40be0f35be0':
  Ensure Netd Service is alive

Change-Id: I733966cdfbfeae1d5603bcbd175af5f7e3038a78