Erik Kline 84a2a19c36 Merge "More correct startup and shutdown procedures." am: 8a825051a2 ...

am: 7b5f0a82d0

Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae

2016-12-15 05:32:50 +00:00

..

core/java/com/android/server

Merge "More correct startup and shutdown procedures." am: 8a825051a2

2016-12-15 05:32:50 +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