summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-060-0/+0
|\ | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c am: 0b8078f8b9 * commit '0b8078f8b9cd096e6d104a04e9e381c94fe3c106': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| * Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-12-061-36/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev am: 1d1abc5b0c * commit '1d1abc5b0ccf31e79aa7173b2e592b7e52b3e519': Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
| | * Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into ↵Daniel Xie2015-10-081-36/+15
| | |\ | | | | | | | | | | | | kitkat-cts-dev
| | | * Fix TimeZoneTest#testPreHistoricOffsets CTS failures.Elliott Hughes2015-10-081-36/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was more complicated than necessary, and now we have better historical data for Asia/Saigon it's started to fail. I've removed that part of the test (because there are now a lot more transitions) and rely solely on Africa/Bissau. We really only need one transition so we can test two times: one before the first transition and one after the last transition. Bug: 18285300 Change-Id: Ic820e88b319095b89779d271f45f5cb1c90173da (cherry picked from commit d05995d8c7488044352343d5125698795032b937)
* | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-060-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours am: bcd9db7050 * commit 'bcd9db7050124d4d8bbd9b732f43efd3291b4aa4': Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
| * | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-12-060-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cbfe -s ours * commit '70a463cbfe0aac6bc88a46b3b103e40d70ff3abf': Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
| | * Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ↵Daniel Xie2015-09-281-4/+5
| | |\ | | | | | | | | | | | | when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev
| | | * Fix the ENGINE_finish/ENGINE_free mixupTakeshi Katae2015-09-101-4/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318 Change-Id: I14b3bb9e6f7ce851a83792b5523d72510120dbbe Signed-off-by: Takeshi Katae <takeshi.katae.xm@kyocera.jp>
* | | am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am ↵Daniel Xie2015-09-150-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '3a8c0d1e1d3f2d434be47f525d60d83320f8b6c9':
| * \ \ am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am ↵Daniel Xie2015-09-120-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'cd8cc93f3558fde16bf25669cb9a57522c8b223a':
| | * \ \ am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am ↵Daniel Xie2015-09-040-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'd59d0d7a7248246d43a58fe417880867a34631f9':
| | | * \ \ am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge ↵Daniel Xie2015-09-040-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit 'aad953fae0bfad5c06fcb60bd1b527312f387d1e': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
| | | | * \ \ am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: ↵Daniel Xie2015-09-040-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '92cec14754d8ad8d9018d0dcb3767663492bc8da': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
| | | | | * \ \ am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ↵Daniel Xie2015-09-040-0/+0
| | | | | |\ \ \ | | | | |/ / / / | | | | | | | _ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '8a012b3a3ce662370beef99a02a4c353edd66c6b': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
* | | | | | | am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip ↵Daniel Xie2015-09-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9':
| * | | | | | am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore ↵Daniel Xie2015-09-120-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | in KeyStoreTest" into kitkat-cts-dev * commit '2ab5a4898ae61056b8eee8231f0761245dd93295':
| | * | | | | am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in ↵Daniel Xie2015-09-040-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyStoreTest" into kitkat-cts-dev * commit '45101b8ebb8d2261c1733d305f5e165971ef7dc1':
| | | * | | | am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into ↵Daniel Xie2015-09-042-1/+8
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev * commit '9f275caac3c90dac2d91c2faf94f4179c9d90fb7': Skip TimaKeyStore in KeyStoreTest
| | | | * | | am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-devDaniel Xie2015-09-042-1/+8
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '977acac83f5c25a1d0ea4aed38af5f05672ce7c5': Skip TimaKeyStore in KeyStoreTest
* | | | | \ \ \ am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add ↵Neil Fuller2015-09-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '05b8a1b98dc6b85029776506eb07fe8c27c626c1':
| * | | | | | | am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add ↵Neil Fuller2015-09-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '5181c7732c3e5db6bff9505470ae4a7db9fc6718':
| | * | | | | | am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() ↵Neil Fuller2015-09-040-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit '4fe837f0ea8682a7e4fd8802b88c9721de517192':
| | | * | | | | am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move ↵Neil Fuller2015-09-041-12/+33
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ethernet verification out of testLoopback()." into kitkat-cts-dev * commit 'd5ae4a3c49703cb7678ccccc4e98ed6c4b1f5b73': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | | | * | | | am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet ↵Neil Fuller2015-09-041-12/+33
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification out of testLoopback()." into kitkat-cts-dev * commit '19679b0fde4e1a7321101b558e2f4961daec923e': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
* | | | | \ \ \ \ am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix ↵Bill Yi2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '8970261ff2e76fc8ff707ca2e799a66f738624e0':
| * | | | | | | | am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race ↵Bill Yi2015-09-120-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit 'c09272efaaefc243123f18e0bb39ae6d3194dfb7':
| | * | | | | | | am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in ↵Bill Yi2015-09-040-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '4f2c91b1160d4b3d5ff7631c4752aaccd028d0ad':
| | | * | | | | | am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." ↵Bill Yi2015-09-040-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit 'bd08c8d83dec8af1ed502522b3c5a125fd693581': Fix race condition in WeakHashMapTest.
| | | | * | | | | am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev ↵Bill Yi2015-09-040-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '6da6b0e4a410cb3bbbbcf56cba742ba881ca1b47': Fix race condition in WeakHashMapTest.
* | | | | \ \ \ \ \ am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for ↵Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev * commit 'f86ad679780b7464c522bf48c8b7281a306862bd':
| * | | | | | | | | am 2d459b82: am 660504ac: Merge "Fixes and improvements for ↵Neil Fuller2015-09-011-37/+67
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev * commit '2d459b820732ffcc775dcb70051e3d0b7f9c7d43': Fixes and improvements for SerializationTest
| | * | | | | | | | am 660504ac: Merge "Fixes and improvements for SerializationTest" into ↵Neil Fuller2015-09-011-37/+67
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev * commit '660504acb29860588107fdf175768e9b036fd3ff': Fixes and improvements for SerializationTest
* | | | | | | | | | am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated ↵Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with an OkHttp bad proxy response fix"" into lollipop-cts-dev * commit 'ecdd89b848b716110df99b556a7cea58b17d4ee7':
| * | | | | | | | | am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp ↵Neil Fuller2015-09-011-8/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bad proxy response fix"" into lollipop-cts-dev * commit 'b472314acb543ad31bdaad26c58b64f25f393038': Revert "Changes associated with an OkHttp bad proxy response fix"
| | * | | | | | | | am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy ↵Neil Fuller2015-09-011-8/+18
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response fix"" into lollipop-cts-dev * commit '34d183b404333627266d568e905a60e2be3a06f3': Revert "Changes associated with an OkHttp bad proxy response fix"
* | | \ \ \ \ \ \ \ \ am 2b4d636e: am 25720de0: am 23fe202d: Merge "Fixes associated with the ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tzdata 2015a update" into lollipop-cts-dev * commit '2b4d636ee34b64923361e7c0ad3a50ed37f8126d':
| * | | | | | | | | | am 25720de0: am 23fe202d: Merge "Fixes associated with the tzdata 2015a ↵Daniel Xie2015-09-011-8/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lollipop-cts-dev * commit '25720de04b90708826a62944428578eb809f51f1': Fixes associated with the tzdata 2015a update
| | * | | | | | | | | am 23fe202d: Merge "Fixes associated with the tzdata 2015a update" into ↵Daniel Xie2015-09-011-8/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev * commit '23fe202d2e3c85b7245648360211aa22547ea355': Fixes associated with the tzdata 2015a update
* | | \ \ \ \ \ \ \ \ \ am df000639: (-s ours) am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit 'df00063926ecc88f439506cc05594bb392e02a58':
| * | | | | | | | | | | am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: ↵Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit '2b6c35362abafa59dd5bde1e33f6c2b77803d31e': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
| | * | | | | | | | | | am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to ↵Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit '91994f09dce81de7b307aa88ce3c1c56cb0c7683': DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
* | | \ \ \ \ \ \ \ \ \ \ am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyStoreTest" into kitkat-cts-dev automerge: 977acac * commit '24a2048498e80cbc8602f56169d9f6875ddb9488':
| * | | | | | | | | | | | am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into ↵Daniel Xie2015-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kitkat-cts-dev automerge: 977acac * commit 'edef8836113a0fd3f9b72be99ed997eebf7809ba': Skip TimaKeyStore in KeyStoreTest
| | * | | | | | | | | | | am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev ↵Daniel Xie2015-09-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 977acac * commit 'c25d8adf4bc85882d0f18858db3724039e5affa5': Skip TimaKeyStore in KeyStoreTest
* | | \ \ \ \ \ \ \ \ \ \ \ am 1bbe8b2c: am dd2f751a: am 2cc18704: Merge "Add testInterfaceProperties() ↵Neil Fuller2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0 * commit '1bbe8b2c14699f39fdf28a11ed39ea5d86f08315':
| * | | | | | | | | | | | | am dd2f751a: am 2cc18704: Merge "Add testInterfaceProperties() . Move ↵Neil Fuller2015-09-011-12/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ethernet verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0 * commit 'dd2f751a6d7e0ab6a3ec89b025bd58194611cb62': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | * | | | | | | | | | | | am 2cc18704: Merge "Add testInterfaceProperties() . Move Ethernet ↵Neil Fuller2015-09-011-12/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0 * commit '2cc187049ed0a5fc6168ffdb8f837b59462e5b53': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
* | | \ \ \ \ \ \ \ \ \ \ \ \ am ba48b679: am 51d4b78c: am 2016dc66: Merge "Add exceptions for ↵Daniel Xie2015-09-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_connectLjava_net_SocketAddressI" into lollipop-cts-dev * commit 'ba48b679fd3dc81ff0a3a6324232272ab7019df6':
| * | | | | | | | | | | | | | am 51d4b78c: am 2016dc66: Merge "Add exceptions for ↵Daniel Xie2015-09-011-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_connectLjava_net_SocketAddressI" into lollipop-cts-dev * commit '51d4b78ccc3db27f4eeabe1ad062f79af118a2c0': Add exceptions for test_connectLjava_net_SocketAddressI
| | * | | | | | | | | | | | | am 2016dc66: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ↵Daniel Xie2015-09-011-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lollipop-cts-dev * commit '2016dc66a98087c57a15d097fcd04e1ed171e57c': Add exceptions for test_connectLjava_net_SocketAddressI