diff options
| author | 2013-08-14 12:19:46 -0700 | |
|---|---|---|
| committer | 2013-08-14 12:19:46 -0700 | |
| commit | 27d209d253171466a43bde75959f6433b6fa97e3 (patch) | |
| tree | f5a40dd234a00bf318d7e0bc5c9c8ab48470c758 /tools/aapt/Images.cpp | |
| parent | c916d04d7454d503e98d25e82041d1b90fe4f22c (diff) | |
| parent | 80f7ec06d0e45a8724122d5b4451ee12e37f9aac (diff) | |
am 80f7ec06: am 04b40ee3: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '80f7ec06d0e45a8724122d5b4451ee12e37f9aac':
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 'tools/aapt/Images.cpp')
0 files changed, 0 insertions, 0 deletions