Wink Saville 2e63bb7ef5 Merge commit '68513498' into fix-merge-conflict ...

* commit '68513498':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458

2013-07-01 16:12:31 -07:00

..

connectivity

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

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

ConnectivityService.java

Merge commit '68513498' into fix-merge-conflict

2013-07-01 16:12:31 -07:00