summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-060-0/+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-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
| | |/
* | | am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad95...Daniel Xie2015-09-150-0/+0
|\ \ \
| * \ \ am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec...Daniel Xie2015-09-120-0/+0
| |\ \ \
| | * \ \ am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012...Daniel Xie2015-09-040-0/+0
| | |\ \ \
| | | * \ \ am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "D...Daniel Xie2015-09-040-0/+0
| | | |\ \ \
| | | | * \ \ am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: r...Daniel Xie2015-09-040-0/+0
| | | | |\ \ \
| | | | | * \ \ am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ki...Daniel Xie2015-09-040-0/+0
| | | | | |\ \ \ | | | | |/ / / / | | | | | | | _
* | | | | | | am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip ...Daniel Xie2015-09-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore ...Daniel Xie2015-09-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTe...Daniel Xie2015-09-040-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitk...Daniel Xie2015-09-042-1/+8
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-devDaniel Xie2015-09-042-1/+8
| | | | |\ \ \
* | | | | \ \ \ am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add t...Neil Fuller2015-09-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceP...Neil Fuller2015-09-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() ....Neil Fuller2015-09-040-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethern...Neil Fuller2015-09-041-12/+33
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verificati...Neil Fuller2015-09-041-12/+33
| | | | |\ \ \ \
* | | | | \ \ \ \ am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix r...Bill Yi2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition...Bill Yi2015-09-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashM...Bill Yi2015-09-040-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into...Bill Yi2015-09-040-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev autom...Bill Yi2015-09-040-0/+0
| | | | |\ \ \ \ \
* | | | | \ \ \ \ \ am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for Seri...Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 2d459b82: am 660504ac: Merge "Fixes and improvements for SerializationTest...Neil Fuller2015-09-011-37/+67
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 660504ac: Merge "Fixes and improvements for SerializationTest" into lollip...Neil Fuller2015-09-011-37/+67
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
* | | | | | | | | | am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated with...Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp ba...Neil Fuller2015-09-011-8/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy respo...Neil Fuller2015-09-011-8/+18
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am 2b4d636e: am 25720de0: am 23fe202d: Merge "Fixes associated with the tzdat...Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 25720de0: am 23fe202d: Merge "Fixes associated with the tzdata 2015a updat...Daniel Xie2015-09-011-8/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 23fe202d: Merge "Fixes associated with the tzdata 2015a update" into lolli...Daniel Xie2015-09-011-8/+0
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ am df000639: (-s ours) am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "D...Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: r...Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ki...Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTe...Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitk...Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev au...Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ am 1bbe8b2c: am dd2f751a: am 2cc18704: Merge "Add testInterfaceProperties() ....Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am dd2f751a: am 2cc18704: Merge "Add testInterfaceProperties() . Move Ethern...Neil Fuller2015-09-011-12/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 2cc18704: Merge "Add testInterfaceProperties() . Move Ethernet verificati...Neil Fuller2015-09-011-12/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ am ba48b679: am 51d4b78c: am 2016dc66: Merge "Add exceptions for test_connect...Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 51d4b78c: am 2016dc66: Merge "Add exceptions for test_connectLjava_net_Soc...Daniel Xie2015-09-011-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 2016dc66: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ...Daniel Xie2015-09-011-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \