Kenny Root 6a0db59901 resolved conflicts for merge of e0b14ea7 to master ...

Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51

2013-12-13 15:59:51 -08:00

..

LockdownVpnTracker.java

Add per user VPN support

2013-07-12 20:51:03 -07:00

NetworkIdentitySet.java

Support metered Wi-Fi NetworkPolicy.

2012-04-05 16:02:25 -07:00

NetworkPolicyManagerService.java

Use java.util.Objects instead on internal API

2013-12-13 13:40:30 -08:00

NetworkStatsCollection.java

Use java.util.Objects instead on internal API

2013-12-13 13:40:30 -08:00

NetworkStatsRecorder.java

Request all tethering interfaces, fix corruption.

2013-09-10 21:03:30 -07:00

NetworkStatsService.java

Fix the race condition for b/11458382

2013-11-04 18:51:12 -08:00