tree dcf9db383dfabbe50de26cb54846b408ba84c903
parent 23374d63ecfd076c41c855bc59f63570cf265a7c
parent ddeaa31b7dc79aeeeb11da715b1356fdcf957e0a
author Erik Kline <ek@google.com> 1516028070 +0000
committer android-build-merger <android-build-merger@google.com> 1516028070 +0000

Merge "change NMS removeNetwork to netd binder variant" am: e61ee4198e am: b73571b981
am: ddeaa31b7d

Change-Id: I38905b12f24f16860de1db18cd12d93fc661c684