summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add depedencies that allow error prone to compile source." am: bda9492f34cm-14.1Ian Rogers2016-05-031-2/+2
|\
| * Merge "Add depedencies that allow error prone to compile source."Ian Rogers2016-05-031-2/+2
| |\
| | * Merge "Add depedencies that allow error prone to compile source."Ian Rogers2016-05-031-2/+2
| |/|
| | * Add depedencies that allow error prone to compile source.Ian Rogers2016-04-291-2/+2
| |/
* | Don\'t build the stub org.apache.http.legacy.jar in PDK build.Ying Wang2016-02-191-1/+1
|\ \
| * | Don't build the stub org.apache.http.legacy.jar in PDK build.staging/cm-14.0Ying Wang2016-02-181-1/+1
* | | apache-http: Fix stubs generation.Narayan Kamath2016-02-120-0/+0
|\| | | |/ |/|
| * apache-http: Fix stubs generation.Narayan Kamath2016-02-121-1/+22
* | Merge "apache-http: Fix stubs generation."Narayan Kamath2016-02-091-1/+22
|\ \ | |/ |/|
| * apache-http: Fix stubs generation.Narayan Kamath2016-02-091-1/+22
|/
* Merge "Unhook a bit from Conscrypt's implementation"Kenny Root2016-02-021-19/+14
|\
| * Unhook a bit from Conscrypt's implementationKenny Root2016-02-021-19/+14
|/
* Merge "Use hostname aware isCleartextTrafficPermitted"Chad Brubaker2016-01-261-4/+7
|\
| * Use hostname aware isCleartextTrafficPermittedChad Brubaker2016-01-261-4/+7
|/
* Merge "Use duck typing to call hostname aware checkServerTrusted"Chad Brubaker2016-01-231-1/+17
|\
| * Use duck typing to call hostname aware checkServerTrustedChad Brubaker2016-01-191-1/+17
|/
* am 72b40431: (-s ours) Merge "Start handshake before calling hostname verifier"Kenny Root2015-05-130-0/+0
|\
| * Merge "Start handshake before calling hostname verifier"Kenny Root2015-05-131-0/+8
| |\
| | * Start handshake before calling hostname verifierKenny Root2015-05-121-0/+8
| |/
* | Use prebuilt stub org.apache.http.legacy for unbundled build.Ying Wang2015-04-141-1/+4
* | Make org.apache.http.legacy a stubs target.Narayan Kamath2015-04-092-3/+6
* | Build stubs for apache-httpNarayan Kamath2015-04-091-6/+87
* | am aa83190c: Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin2015-03-301-0/+43
|\|
| * Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin2015-03-301-0/+43
| |\
| | * Honor NetworkSecurityPolicy regarding cleartext traffic.Alex Klyubin2015-03-271-0/+43
| |/
* | Archive org.apache.http.legacy.jarYing Wang2015-02-251-0/+3
* | Merge "Unbundle org.apache.http.legacy."Narayan Kamath2015-02-1325-72/+431
|\ \
| * | Unbundle org.apache.http.legacy.Narayan Kamath2015-02-0425-72/+431
* | | Merge "Move apache specific portions of android.net.http to apache-http."Narayan Kamath2015-02-1341-1920/+7116
|\| |
| * | Move apache specific portions of android.net.http to apache-http.Narayan Kamath2015-02-0441-1920/+7116
* | | Add a file that proves the existence of unbundled-apache.Narayan Kamath2015-02-111-0/+4
|/ /
* | am 1cbd67d9: am c7fe4b37: Merge "Fix @link annotation in documentation for hy...Elliott Hughes2015-01-281-1/+1
|\|
| * am c7fe4b37: Merge "Fix @link annotation in documentation for hyperlink gener...Elliott Hughes2015-01-281-1/+1
| |\
| | * Merge "Fix @link annotation in documentation for hyperlink generation"Elliott Hughes2015-01-281-1/+1
| | |\
| | | * Fix @link annotation in documentation for hyperlink generationRuey-Shi Rau2015-01-281-1/+1
| | |/
* | / Add placeholder library for org.apache.http.legacy.Narayan Kamath2015-01-202-0/+44
|/ /
* | am f2971864: Merge "Remove apache-http host build."Narayan Kamath2014-12-101-24/+0
|\|
| * Merge "Remove apache-http host build."Narayan Kamath2014-12-101-24/+0
| |\
| | * Remove apache-http host build.Narayan Kamath2014-12-081-24/+0
| |/
* / Deprecate apache-http.Narayan Kamath2014-10-23394-0/+2003
|/
* am df55e5b2: am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02:...staging/cm-12.0-cafstaging/cm-12.0Alex Klyubin2014-07-280-0/+0
|\
| * am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am b260a116:...Alex Klyubin2014-07-281-32/+4
| |\
| | * am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter sub...Alex Klyubin2014-07-281-32/+4
| | |\
| | | * am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter subject DN parsi...Alex Klyubin2014-07-281-32/+4
| | | |\
| | | | * am 945aab57: am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS ...Alex Klyubin2014-07-281-32/+4
| | | | |\
| | | | | * am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname veri...Alex Klyubin2014-07-281-32/+4
| | | | | |\
| | | | | | * am b260a116: Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-281-32/+4
| | | | | | |\
| | | | | | | * Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-251-32/+4
* | | | | | | | Stricter subject DN parsing for HTTPS hostname verification.Alex Klyubin2014-07-241-32/+4
* | | | | | | | am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-131-8/+6
|\| | | | | | |