diff options
| author | 2013-08-14 12:34:09 -0700 | |
|---|---|---|
| committer | 2013-08-14 12:34:09 -0700 | |
| commit | 9bc25aa8a52a1aa2890d19d2c1a3eedf92b92c36 (patch) | |
| tree | 219a30e5f5a431bd35ba124e7e617d45daaaa700 /tools/aapt/Images.cpp | |
| parent | 166d823ad537460a973a4bd7deaea7a64c99cb02 (diff) | |
| parent | 27d209d253171466a43bde75959f6433b6fa97e3 (diff) | |
am 27d209d2: (-s ours) am 80f7ec06: am 04b40ee3: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '27d209d253171466a43bde75959f6433b6fa97e3':
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