summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-devDaniel Xie2015-12-060-0/+0
|\
| * Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-devDaniel Xie2015-10-081-8/+0
| |\
| | * Fixes associated with the tzdata 2015a updateNeil Fuller2015-10-081-8/+0
* | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-061-36/+15
|\| |
| * | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-10-081-36/+15
| |\ \ | | |/ | |/|
| | * Fix TimeZoneTest#testPreHistoricOffsets CTS failures.Elliott Hughes2015-10-081-36/+15
| |/
* | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-060-0/+0
|\|
| * Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-09-281-4/+5
| |\
| | * Fix the ENGINE_finish/ENGINE_free mixupTakeshi Katae2015-09-101-4/+5
| |/
* | Merge "Fixes and improvements for SerializationTest" into lollipop-cts-devNeil Fuller2015-08-241-37/+67
|\ \
| * | Fixes and improvements for SerializationTestNeil Fuller2015-08-201-37/+67
|/ /
* | Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" int...Neil Fuller2015-08-041-8/+18
|\ \
| * | Revert "Changes associated with an OkHttp bad proxy response fix"Neil Fuller2015-07-171-8/+18
* | | Merge "Fixes associated with the tzdata 2015a update" into lollipop-cts-devDaniel Xie2015-08-031-8/+0
|\ \ \
| * | | Fixes associated with the tzdata 2015a updateNeil Fuller2015-08-031-8/+0
|/ / /
* | | Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to mis...Daniel Xie2015-07-310-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to mis...Daniel Xie2015-07-221-3/+0
| |\ \
| | * | DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev dueDaniel Xie2015-07-211-3/+0
| |/ /
* | / Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-devDaniel Xie2015-07-170-0/+0
|\| | | |/ |/|
| * Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-devDaniel Xie2015-07-142-1/+8
| |\
| | * Skip TimaKeyStore in KeyStoreTestAn Liu2015-07-142-1/+8
| |/
* | Merge "Add testInterfaceProperties() . Move Ethernet verification out of tes...Neil Fuller2015-07-131-12/+33
|\|
| * Merge "Add testInterfaceProperties() . Move Ethernet verification out of tes...Neil Fuller2015-07-131-12/+33
| |\
| | * Add testInterfaceProperties() . Move Ethernet verification out of testLoopba...Tochau Hoang2015-07-081-12/+33
| |/
* | Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-041-0/+12
|\ \
| * | Add exceptions for test_connectLjava_net_SocketAddressITiberiu Breana2015-06-041-0/+12
|/ /
* | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo...Neil Fuller2015-06-021-1/+1
|\ \
| * | Fix for MulticastSocketTest for non-multicast interfacesNeil Fuller2015-06-021-1/+1
|/ /
* | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
|\ \
| * | Fix problems with DexClassLoaderTest.Richard Uhler2015-05-291-285/+163
|/ /
* | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
|\|
| * Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| |\
| | * Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | |\
| | | * Merge "Fix race condition in WeakHashMapTest." into jb-devBill Yi2015-05-280-0/+0
| | | |\
| | | | * Merge "Fix race condition in WeakHashMapTest." into jb-devBill Yi2014-07-071-6/+12
| | | | |\
| | | | | * Fix race condition in WeakHashMapTest.Mathieu Chartier2014-07-081-6/+12
| | | | |/
* | | | | Suppress okhttp's ResponseCacheAdapterTest.Takayuki Hoshi2015-04-171-0/+1
* | | | | am d0ba0110: am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for me...Neil Fuller2014-12-120-0/+0
|\ \ \ \ \
| * \ \ \ \ am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for merge of bfeba0...Neil Fuller2014-12-120-0/+0
| |\ \ \ \ \
| | * | | | | am 5bca0d94: am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-...Neil Fuller2014-12-120-0/+0
| | |\| | | |
| | | * | | | am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aospNeil Fuller2014-12-120-0/+0
| | | |\ \ \ \
| | | | * \ \ \ resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aospNeil Fuller2014-12-120-0/+0
| | | | |\ \ \ \
| | | | | * | | | Fix for TLS HTTP connections with GMS socketsNeil Fuller2014-12-111-1/+2
* | | | | | | | | Merge "Fix libcore.java.net.OldCookieHandlerTest#test_get_put()" into lmp-spr...Wei Liu2014-12-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix libcore.java.net.OldCookieHandlerTest#test_get_put()Wei Liu2014-12-081-1/+1
* | | | | | | | | | Fix failing socket tests.Narayan Kamath2014-12-055-49/+33
|/ / / / / / / / /
* | | | | | | | | Merge "Delete ContentHandlerFactoryTest." into lmp-sprout-devNarayan Kamath2014-12-042-152/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Delete ContentHandlerFactoryTest.Narayan Kamath2014-12-042-152/+0
* | | | | | | | | | Use a MockWebServer instead of hitting the network.Jason Parks2014-12-041-39/+34
|/ / / / / / / / /
* | | | | | | | | am 8edeef21: Create GregorianCalendar via a delegate.Deepanshu Gupta2014-12-031-1/+7
|\| | | | | | | |