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

Merge commit '53221120' into fix-merge-conflict 

* commit '53221120':
  Do not always call setIsConnectedToProvisioningNetwork(false)

Conflicts:
	core/java/android/net/MobileDataStateTracker.java

Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
parents 6c025eaf 53221120
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