tree 2fc47f8ac27b0aa4163e9b18fcc9db266cef943b
parent 90102e2ccc62e82382b1e0094a47e1516e1b9e36
parent 86ad8e6871e778e1ee47d4f723bbd1d5f8fc00bf
author Wink Saville <wink@google.com> 1379799582 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379799582 -0700

am 86ad8e68: am 56065891: Merge commit \'53221120\' into fix-merge-conflict

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