am 81a3dfd4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '81a3dfd4e33c318769f29cf3eb7e00a42c2d1ecc':
  Show warnings when skipping Wi-Fi connection
This commit is contained in:
The Android Open Source Project
2012-10-02 09:24:46 -07:00
committed by Android Git Automerger

Diff Content Not Available