summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEmarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-dragon-release-Maymarshmallow-dr-dragon-releasemarshmallow-dr-devBaligh Uddin2015-09-181-0/+11
* Change to connectivitycheck.gstatic.commarshmallow-releasemarshmallow-devmarshmallow-cts-releaseErik Kline2015-07-201-1/+1
* Add android.net.CaptivePortal class for captive-portal-handling-app callbacksPaul Jensen2015-07-091-5/+6
* Import translations. DO NOT MERGEGeoff Mendal2015-06-105-6/+6
* Log SslErrors from captive portal sign in app.Paul Jensen2015-06-091-1/+4
* Add support for tel: links in captive portal app.Paul Jensen2015-06-091-0/+9
* Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-462/+231
* Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0377-0/+462
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-06-0377-0/+462
* | Disallow going back to initial empty page in captive portal appPaul Jensen2015-06-031-12/+25
|/
* Merge "Update captive portal sign-in app SSL error page UI." into mnc-devPaul Jensen2015-06-034-10/+70
|\
| * Update captive portal sign-in app SSL error page UI.Paul Jensen2015-06-034-10/+70
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+8
|/
* Don't leak NetworkListens in captive portal app.Paul Jensen2015-05-181-0/+11
* Add URL bar to captive portal login app.Paul Jensen2015-05-062-5/+17
* Merge commit '25a217c' into merge2Etan Cohen2015-04-242-40/+31
|\
| * Add captive portal API.Paul Jensen2015-04-162-40/+31
* | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+24
* | Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-1/+1
|\|
| * Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-021-1/+1
* | merge in master-release history after reset to masterThe Android Automerger2015-03-210-0/+0
|\ \
| * \ merge in master-release history after reset to masterThe Android Automerger2015-03-190-0/+0
| |\ \
| | * \ merge in master-release history after reset to masterThe Android Automerger2015-03-170-0/+0
| | |\ \
| | | * \ merge in master-release history after reset to masterThe Android Automerger2015-03-050-0/+0
| | | |\ \
| | | | * \ merge in master-release history after reset to masterThe Android Automerger2015-03-050-0/+0
| | | | |\ \ | | | | |/ / | | | |/| |
* | | / | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2044-86/+51
|/ / / / /
* / / / / Import translations. DO NOT MERGEGeoff Mendal2015-03-1829-58/+29
|/ / / /
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-1672-72/+144
* | | | am "Correct "Sign-in" and "Sign into" to "Sign in to"."Vinit Deshpande2015-03-153-3/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Correct "Sign-in" and "Sign into" to "Sign in to".Paul Jensen2015-03-033-3/+3
* | | Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
| |/ |/|
* | am 6de722ad: (-s ours) am 46c5d0b1: (-s ours) Merge "Import translations. DO ...Geoff Mendal2015-02-270-0/+0
|\ \
| * \ am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-a...Geoff Mendal2015-02-270-0/+0
| |\ \
| | * | Import translations. DO NOT MERGEmaster-soongGeoff Mendal2015-02-2672-0/+576
| |/ /
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-1/+1
* | | resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-1/+1
|\| |
| * | am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hos...Lorenzo Colitti2015-01-141-1/+1
| |\|
| | * Switch the connectivity check to its own hostname.lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-devlollipop-mr1-cts-releaseLorenzo Colitti2015-01-141-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-231-1/+1
* | | am c266f62f: am eece3339: Merge "Show broken lock image when SSL errors are e...Paul Jensen2014-12-172-0/+15
|\| |
| * | am eece3339: Merge "Show broken lock image when SSL errors are encountered in...Paul Jensen2014-12-172-0/+15
| |\|
| | * Merge "Show broken lock image when SSL errors are encountered in CaptivePorta...Paul Jensen2014-12-172-0/+15
| | |\
| | | * Show broken lock image when SSL errors are encountered in CaptivePortalLogin.Paul Jensen2014-12-102-0/+15
* | | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-111-24/+5
|\| | |
| * | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-111-24/+5
| |\| |
| | * | Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-101-24/+5
| | |/
* | | am f19f90b2: am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state...Paul Jensen2014-11-261-12/+27
|\| |
| * | am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-in...Paul Jensen2014-11-261-12/+27
| |\|
| | * Don't let NetworkMonitor state stop user-initiated transitions.Paul Jensen2014-11-241-12/+27
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-09 10:38:58 +0000