diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-08-14 12:16:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-14 12:16:21 -0700 |
| commit | 231f0aaf29bb9cae665fd9c8bdcc34f01e7b5ce2 (patch) | |
| tree | 71bac1fbcd6bb2348beca53997c07a9b204f2c78 /framework/java/android/bluetooth/BluetoothAssignedNumbers.java | |
| parent | 33b8f26c2ec41245e4e183686884624526c5eea4 (diff) | |
| parent | 3bc859a0bea240b36b8ce76840ba0d7803a0e967 (diff) | |
am 3bc859a0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '3bc859a0bea240b36b8ce76840ba0d7803a0e967':
Use hostname verifier directly instead of instance DO NOT MERGE
If in a mobile captive portal is detected enable fail fast.
Have CaptivePortalTracker use gservices updateable provisioning urls.
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Check that hipri has started.
Fix issue #10226007: Reset apps restores most of the changed settings...
Fix issue #10226007: Reset apps restores most of the changed settings...
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAssignedNumbers.java')
0 files changed, 0 insertions, 0 deletions