summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and improvements for Seri...Neil Fuller2015-08-241-37/+67
|\
| * am 57601a42: am d387c0ad: Merge "Fixes and improvements for SerializationTest...Neil Fuller2015-08-241-37/+67
| |\
| | * am d387c0ad: Merge "Fixes and improvements for SerializationTest" into lollip...Neil Fuller2015-08-241-37/+67
| | |\
| | | * Merge "Fixes and improvements for SerializationTest" into lollipop-cts-devNeil Fuller2015-08-241-37/+67
| | | |\
| | | | * 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
| | | | |/
* | | | | am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes associa...Neil Fuller2015-08-061-18/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes associated with an O...Neil Fuller2015-08-061-18/+8
| |\ \ \ \ | | |/ / /
| | * | | am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad pro...Neil Fuller2015-08-061-18/+8
| | |\ \ \ | | | |/ /
| | | * | Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response f...Neil Fuller2015-08-061-18/+8
| | | |\ \
| | | | * | Revert "Revert "Changes associated with an OkHttp bad proxy response fix""Neil Fuller2015-08-051-18/+8
| | | |/ /
* | | | | am c1c9f15e: am 3a6966a3: am 8426987b: Merge "Revert "Changes associated with...Neil Fuller2015-08-051-8/+18
|\ \ \ \ \ | |/ / / /
| * | | | am 3a6966a3: am 8426987b: Merge "Revert "Changes associated with an OkHttp ba...Neil Fuller2015-08-041-8/+18
| |\ \ \ \ | | |/ / /
| | * | | am 8426987b: Merge "Revert "Changes associated with an OkHttp bad proxy respo...Neil Fuller2015-08-041-8/+18
| | |\ \ \ | | | |/ /
| | | * | Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" int...Neil Fuller2015-08-041-8/+18
| | | |\ \ | | | | |/
| | | | * 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
* | | | | | am d7e7b626: am 804cc979: am 89ebe31d: Merge "Fixes associated with the tzdat...Daniel Xie2015-08-050-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 804cc979: am 89ebe31d: Merge "Fixes associated with the tzdata 2015a updat...Daniel Xie2015-08-040-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 89ebe31d: Merge "Fixes associated with the tzdata 2015a update" into lolli...Daniel Xie2015-08-040-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fixes associated with the tzdata 2015a update" into lollipop-cts-devDaniel Xie2015-08-040-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | 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
| | | | |/ /
* | | | | | am 26b87997: (-s ours) am 4366a97c: (-s ours) am ba08bcd5: (-s ours) Merge "D...Daniel Xie2015-08-050-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4366a97c: (-s ours) am ba08bcd5: (-s ours) Merge "DO NOT MERGE ANYWHERE: r...Daniel Xie2015-07-310-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am ba08bcd5: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ki...Daniel Xie2015-07-310-0/+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-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
| | | | |/ /
* | | | | | am 05c1ad2b: am 1f2b629a: Merge "Skip TimaKeyStore in KeyStoreTest" into kitk...Daniel Xie2015-07-170-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1f2b629a: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev au...Daniel Xie2015-07-170-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acacDaniel Xie2015-07-170-0/+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
| | | | |/
* | | | | am 157dae46: am 88051ed3: Merge "Add testInterfaceProperties() . Move Ethern...Neil Fuller2015-07-131-12/+33
|\ \ \ \ \ | |/ / / /
| * | | | am 88051ed3: Merge "Add testInterfaceProperties() . Move Ethernet verificati...Neil Fuller2015-07-131-12/+33
| |\ \ \ \ | | |/ / /
| | * | | 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
| | | |\ \ | | | | |/
| | | | * 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
| | | | |/
* | | | | am 45c2f8a3: am a17cd656: Merge "Explicitly set DateFormat.is24Hour value nee...Daniel Xie2015-07-024-9/+26
|\ \ \ \ \ | |/ / / /
| * | | | am a17cd656: Merge "Explicitly set DateFormat.is24Hour value needed by tests"...Daniel Xie2015-07-024-9/+26
| |\ \ \ \ | | |/ / /
| | * | | Merge "Explicitly set DateFormat.is24Hour value needed by tests" into lollipo...Daniel Xie2015-07-014-9/+26
| | |\ \ \
| | | * | | Explicitly set DateFormat.is24Hour value needed by testsNeil Fuller2015-06-154-9/+26
* | | | | | am 9db04571: am eeb2a73b: Merge "Fix for devices with multiple multicast-capa...Neil Fuller2015-06-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am eeb2a73b: Merge "Fix for devices with multiple multicast-capable interface...Neil Fuller2015-06-261-8/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix for devices with multiple multicast-capable interfaces" into lolli...Neil Fuller2015-06-261-8/+28
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix for devices with multiple multicast-capable interfacesNeil Fuller2015-06-191-8/+28
| | |/ / /