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 | 80f7ec06d0e45a8724122d5b4451ee12e37f9aac (patch) | |
| tree | 0cd02c1d09a417fa1e5754daab4475e6a5122a36 /core/java/android/webkit/HTML5VideoViewProxy.java | |
| parent | c11cb1497d26daaf445ca232057027bebc44086c (diff) | |
| parent | 04b40ee33e0f1649bedc9b0b9b3e277b6b37f164 (diff) | |
| download | frameworks_base-80f7ec06d0e45a8724122d5b4451ee12e37f9aac.zip frameworks_base-80f7ec06d0e45a8724122d5b4451ee12e37f9aac.tar.gz frameworks_base-80f7ec06d0e45a8724122d5b4451ee12e37f9aac.tar.bz2 | |
am 04b40ee3: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '04b40ee33e0f1649bedc9b0b9b3e277b6b37f164':
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 'core/java/android/webkit/HTML5VideoViewProxy.java')
0 files changed, 0 insertions, 0 deletions