Wink Saville 0cc0a44c2f Merge commit '3463b3ff' into fix-merge-conflict ...

* commit '3463b3ff':
  Add checkMobileProvisioning to ConnectivityService.

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

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458

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

..

android/server

Merge commit '3463b3ff' into fix-merge-conflict

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