tree cafd980497fda12924f047869d3e57b6cb8425c4
parent b6812a0cf65b4ddfe250ad1d6f47168dc983b025
parent 3b5d686e683b1811ca90e056065dcf3805bb256a
author Wink Saville <wink@google.com> 1372720351 -0700
committer Wink Saville <wink@google.com> 1372720351 -0700

Merge commit '3b5d686e' into fix-merge-conflict

* commit '3b5d686e':
  Add checkMobileProvisioning to ConnectivityService.

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

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458