Skip to content
Commit 9f6a7f42 authored by Wink Saville's avatar Wink Saville
Browse files

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

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

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

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
parents b6812a0c 3b5d686e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment