
Solved building and merge conflict problem.
Signed-off-by: egoncalv <elisamaraaoki.goncalves@windriver.com>
Change-Id: I9272fa6246bd60ace6a5f7ba64fdb4181b1e4721
(cherry picked from commit c12cf2bc59
)
Solved building and merge conflict problem.
Signed-off-by: egoncalv <elisamaraaoki.goncalves@windriver.com>
Change-Id: I9272fa6246bd60ace6a5f7ba64fdb4181b1e4721
(cherry picked from commit c12cf2bc59
)