summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Expand)AuthorAgeFilesLines
* am 3eb44e34: Merge "Delete ContentHandlerFactoryTest." into lmp-sprout-devNarayan Kamath2014-12-041-145/+0
|\
| * Merge "Delete ContentHandlerFactoryTest." into lmp-sprout-devNarayan Kamath2014-12-041-145/+0
| |\
| | * Delete ContentHandlerFactoryTest.Narayan Kamath2014-12-041-145/+0
* | | am 003933ae: Use a MockWebServer instead of hitting the network.Jason Parks2014-12-041-39/+34
|\ \ \ | |/ /
| * | Use a MockWebServer instead of hitting the network.Jason Parks2014-12-041-39/+34
| |/
* | am 04704e37: am 8edeef21: Create GregorianCalendar via a delegate.Deepanshu Gupta2014-12-041-1/+7
|\ \ | |/
| * am 8edeef21: Create GregorianCalendar via a delegate.Deepanshu Gupta2014-12-031-1/+7
| |\
| | * Create GregorianCalendar via a delegate.Deepanshu Gupta2014-11-241-1/+7
* | | am ea05f82a: Merge "Fix obsolete javadoc." into lmp-sprout-devNarayan Kamath2014-12-031-4/+3
|\ \ \ | |/ /
| * | Merge "Fix obsolete javadoc." into lmp-sprout-devNarayan Kamath2014-12-031-4/+3
| |\ \
| | * | Fix obsolete javadoc.Narayan Kamath2014-12-021-4/+3
* | | | Merge "Add tests for issue 18554122." into lmp-mr1-devNarayan Kamath2014-12-031-0/+26
|\ \ \ \
| * | | | Add tests for issue 18554122.Narayan Kamath2014-12-021-0/+26
* | | | | am 383419e3: Merge "Changes associated with an OkHttp bad proxy response fix"...Narayan Kamath2014-12-021-18/+8
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Changes associated with an OkHttp bad proxy response fix" into lmp-spr...Narayan Kamath2014-12-021-18/+8
| |\ \ \ \
| | * | | | Changes associated with an OkHttp bad proxy response fixNeil Fuller2014-12-021-18/+8
| | | |/ / | | |/| |
* | | | | Merge "Add test case for issue 18428603" into lmp-mr1-devNarayan Kamath2014-12-021-0/+23
|\ \ \ \ \
| * | | | | Add test case for issue 18428603Narayan Kamath2014-12-021-0/+23
| | |_|/ / | |/| | |
* | | | | am 40122b34: Fix failing connection tests.Jason Parks2014-12-021-2/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix failing connection tests.Jason Parks2014-12-021-2/+3
| |/ /
* | | Fix crash in selector.wakeup() with closed selectorNeil Fuller2014-11-286-70/+62
* | | am 939e6a1a: Fix URLConnectionTest for devices without full internet access.Aaron Whyte2014-11-252-61/+1
|\ \ \ | |/ /
| * | Fix URLConnectionTest for devices without full internet access.Aaron Whyte2014-11-242-61/+1
| |/
| * am af634dae: am 18c077b3: am 08855205: am 77a7e48a: Fix a bug in DefaultHostn...Alex Klyubin2014-11-192-1/+4
| |\
| | * am 18c077b3: am 08855205: am 77a7e48a: Fix a bug in DefaultHostnameVerifier w...Alex Klyubin2014-11-192-1/+4
| | |\
| | | * am 08855205: am 77a7e48a: Fix a bug in DefaultHostnameVerifier wildcard handl...Alex Klyubin2014-11-192-1/+4
| | | |\
| | | | * am 77a7e48a: Fix a bug in DefaultHostnameVerifier wildcard handling.Alex Klyubin2014-11-192-1/+4
| | | | |\
| | | | | * Fix a bug in DefaultHostnameVerifier wildcard handling.Alex Klyubin2014-11-192-1/+4
| | | | * | resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aospNeil Fuller2014-10-103-8/+322
| | | | |\ \ | | | | | |/
| | | | | * Add support for TLS_FALLBACK_SCSVNeil Fuller2014-10-078-13/+369
| | * | | | resolved conflicts for merge of 6c9609af to klp-modular-devNeil Fuller2014-10-093-72/+314
| | |\ \ \ \ | | | |/ / /
| | | * | | Add support for TLS_FALLBACK_SCSVNeil Fuller2014-10-083-72/+314
| | * | | | am 14d20299: am d6aa6177: am 008b2de6: Add additional field checks for deseri...Neil Fuller2014-08-294-18/+129
| | |\ \ \ \ | | | |/ / /
| | | * | | am d6aa6177: am 008b2de6: Add additional field checks for deserialization.Neil Fuller2014-08-294-18/+129
| | | |\ \ \ | | | | |/ /
| | | | * | am 008b2de6: Add additional field checks for deserialization.Neil Fuller2014-08-294-18/+129
| | | | |\ \ | | | | | |/
| | | | | * Add additional field checks for deserialization.Neil Fuller2014-08-284-18/+129
| | * | | | am df171680: am 009ec47d: am 7c761052: am 8114da7b: resolved conflicts for me...Alex Klyubin2014-07-252-20/+102
| | |\ \ \ \ | | | |/ / /
| | | * | | am 009ec47d: am 7c761052: am 8114da7b: resolved conflicts for merge of 590e76...Alex Klyubin2014-07-252-20/+102
| | | |\ \ \ | | | | |/ /
| | | | * | am 7c761052: am 8114da7b: resolved conflicts for merge of 590e76dd to jb-mr1-...Alex Klyubin2014-07-252-20/+102
| | | | |\ \ | | | | | |/
| | | | | * am 8114da7b: resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aospAlex Klyubin2014-07-252-20/+102
| | | | | |\
| | | | | | * resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aospAlex Klyubin2014-07-252-20/+102
| | | | | | |\
| | | | | | | * am 4fec20ec: DO NOT MERGE: Add a way to get all values of an attribute of DN.Alex Klyubin2014-07-252-0/+138
| | | | | | | |\
| | | | | | | | * DO NOT MERGE: Add a way to get all values of an attribute of DN.Alex Klyubin2014-07-252-0/+138
| | * | | | | | | am f7b609fa: am a99ec913: am be5fed6a: am 4d73cf3c: am 81feaa00: am 889e1d5a:...Neil Fuller2014-07-214-21/+349
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am a99ec913: am be5fed6a: am 4d73cf3c: am 81feaa00: am 889e1d5a: am 1fe89b7b:...Neil Fuller2014-07-214-21/+349
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am be5fed6a: am 4d73cf3c: am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f:...Neil Fuller2014-07-214-21/+349
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | am 4d73cf3c: am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved con...Neil Fuller2014-07-214-21/+349
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved conflicts for me...Neil Fuller2014-07-214-21/+349
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | am 1fe89b7b: am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-...Neil Fuller2014-07-214-21/+349
| | | | | | | |\ \ | | | | | | | | |/
| | | | | | | | * am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aospNeil Fuller2014-07-214-21/+349
| | | | | | | | |\