Robert Greenwalt bfc7634b36 resolved conflicts for merge of f9774dc7 to master ...

Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f

2013-07-19 14:30:49 -07:00

..

DataConnectionStats.java

Move battery stats call from SystemUI to system server.

2013-06-25 10:21:11 -04:00

Nat464Xlat.java

464xlat: use a gatewayed route, not point-to-point

2013-06-29 00:14:43 +09:00

Tethering.java

resolved conflicts for merge of f9774dc7 to master

2013-07-19 14:30:49 -07:00

Vpn.java

Restricted profiles use Owner's VPN

2013-07-15 12:13:47 -07:00