Merge branch 'master' into sol006 05/8405/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 16 Dec 2019 16:24:03 +0000 (17:24 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 16 Dec 2019 16:25:04 +0000 (17:25 +0100)
commit9a55a153e26524e3cd051d3e97a03aff3f4dc8b6
treea7d71aaa52a9abcb317d5d79943f509958f6d04d
parentc900490e2342643eff668a8e93fcba0cfcdcbfb6
parent308422682bf5b5d0def81adb5220069707237c0d
Merge branch 'master' into sol006

Change-Id: Iaa1a32bb76c06720e941b6d801da72b1b1ad9af4
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>