Erik Kline b6588f9a41 Merge "More correct startup and shutdown procedures." ...

am: 618d4215a2

Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42

2016-12-15 05:25:48 +00:00

..

java/android/net

Merge "More correct startup and shutdown procedures."

2016-12-15 05:25:48 +00:00

Android.mk

Remove INetd AIDL reference

2016-08-30 11:40:20 +09:00