GitLab

* commit 'ba1b44d5':
  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

Change-Id: I1cd7c9a1a026e73f4e7ff7cc8ae69fc269866640

am 66b3ce69: am 70a463cb: Merge "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" into kitkat-c

* commit '66b3ce69':
  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

am 70a463cb: Merge "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" into kitkat-cts-dev

* commit '70a463cb':
  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 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

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 d59d0d7a: (-s ours) am 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 'd59d0d7a':

am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit '45101b8e':

am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '4fe837f0':

am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53

* commit '4f2c91b1':

am 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 'aad953fa':
  DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE

* commit '9f275caa':
  Skip TimaKeyStore in KeyStoreTest

am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit 'd5ae4a3c':
  Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback().

am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53

* commit 'bd08c8d8':
  Fix race condition in WeakHashMapTest.

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 '92cec147':
  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 kitkat-cts-dev due to missing CVE" into kitkat-cts-dev

* commit '8a012b3a':
  DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE

* commit '977acac8':
  Skip TimaKeyStore in KeyStoreTest

am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '19679b0f':
  Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback().

am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53

* commit '6da6b0e4':
  Fix race condition in WeakHashMapTest.

* commit '660504ac':
  Fixes and improvements for SerializationTest

am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev

* commit '34d183b4':
  Revert "Changes associated with an OkHttp bad proxy response fix"

* commit '23fe202d':
  Fixes associated with the tzdata 2015a update

am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3a  -s ours

* commit '91994f09':
  DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE

* commit 'c25d8adf':
  Skip TimaKeyStore in KeyStoreTest

am 2cc18704: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0f

* commit '2cc18704':
  Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback().

* commit '2016dc66':
  Add exceptions for test_connectLjava_net_SocketAddressI

* commit '27ef0eb2':
  Fix for MulticastSocketTest for non-multicast interfaces

* commit '7feb222f':
  Fix problems with DexClassLoaderTest.

am 662ec05f: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53 automerge: 6da6b0e4

* commit '662ec05f':
  Fix race condition in WeakHashMapTest.

* commit '49c0bf1f':
  Suppress okhttp's ResponseCacheAdapterTest.

am 2784ad7c: am d0ba0110: am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aosp

* commit '2784ad7c':

* commit '5c1aebcf':
  Fix libcore.java.net.OldCookieHandlerTest#test_get_put()

* commit 'a951e748':
  Fix failing socket tests.

* commit '3eb44e34':
  Delete ContentHandlerFactoryTest.

* commit '003933ae':
  Use a MockWebServer instead of hitting the network.

* commit '04704e37':

* commit 'ea05f82a':
  Fix obsolete javadoc.

* commit '383419e3':
  Changes associated with an OkHttp bad proxy response fix

* commit '40122b34':
  Fix failing connection tests.

* commit '939e6a1a':
  Fix URLConnectionTest for devices without full internet access.