Hugo Benichi 7d82c66d31 Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 ...

am: 164854bde2

Change-Id: I1495249f1ced84438dbd5dd0ad6678e2ee4062cb

2017-05-11 14:28:23 +00:00

..

core/java/com/android/server

Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0

2017-05-11 14:28:23 +00:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

2017-04-26 17:17:04 +09:00

tests/servicestests

Implement metered tracking for NetworkStats summary queries.

2017-01-26 18:52:32 +09:00