tree 67eafd2678f80a35af281abbb77771f8d71fbeb8
parent 84d0a011be869fe264a202779cf121046f4a9a7d
author lombardofr <lombardo@everyup.it> 1529343359 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> 1532002264 +0100

partial integration with master branch

Change-Id: I07e6266b021f038712d74a0af67a45e012753e34
Signed-off-by: lombardofr <lombardo@everyup.it>