GitLab

am 73e64b14: am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

* commit '73e64b14':
  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 afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

* commit 'afe2e6ce':
  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 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

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

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

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

* 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

am 75090d49: (-s ours) am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) 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

* commit '75090d49':

am 13405d75: am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit '13405d75':

am 07238756: am 507bf148: am 3731a3c5: am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '07238756':

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

* commit 'a08a66a7':

am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) 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 ki

* commit 'ebc4ca82':

am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit '55b43a5c':

am 507bf148: am 3731a3c5: am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '507bf148':

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

* commit '96d0e10e':

am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) 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 'c5a96cff':

am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit '141d6fed':

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

* commit '3731a3c5':

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

* commit 'dc98ff65':

am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) 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 '3a8c0d1e':

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

* commit '9b98f31f':

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

* commit '05b8a1b9':

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

* commit '8970261f':

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

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

* commit '2ab5a489':

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

* commit '5181c773':

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

* commit 'c09272ef':

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>

Multicast on a point-to-point interface isn't really multicast.

Bug: 23279677
(cherry-picked from commit 67d7597d)

Change-Id: Ib102e9d04744d3e99b8828ac31d9548e72b703dd

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.