tree 3b408f53ebad85033428b6403e9235c60d771072
parent ce97896b33ec08270503204509e4212da7c08b18
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1513968542 -0500
committer Hugo Arès <hugares@gmail.com> 1518097362 +0000

Adapt to changes in master

Change-Id: I1c8f9bf47faf9e6964e7e2222e614483d1f8ccb0