
Fix conflict
Change-Id: I18404556377a23ed29da8119bd15938e224b757d
Signed-off-by: Elisamara Aoki Goncalves <elisamaraaoki.goncalves@windriver.com>
(cherry picked from commit fb6c9f82f7
)
Fix conflict
Change-Id: I18404556377a23ed29da8119bd15938e224b757d
Signed-off-by: Elisamara Aoki Goncalves <elisamaraaoki.goncalves@windriver.com>
(cherry picked from commit fb6c9f82f7
)