Erik Kline 22c6c1a5b2 Merge "More correct startup and shutdown procedures." ...

am: 0530b1e65d

Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42

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

..

core/java/com/android/server

Merge "More correct startup and shutdown procedures."

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

net/java/android/net

More correct startup and shutdown procedures.

2016-12-15 10:43:41 +09:00

tests/servicestests

DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.

2016-12-09 13:59:33 +09:00