Merge branch 'tizen_5.5' into tizen
authorJi-hoon Lee <dalton.lee@samsung.com>
Fri, 21 Aug 2020 11:39:12 +0000 (20:39 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Fri, 21 Aug 2020 11:39:12 +0000 (20:39 +0900)
commit923d948441131c792ea632a1c52635254bc1b93c
tree70b753d43cb58a44ea163701afc0edeb2675d24e
parent6e714a0d9938715ce8ce93bb9df68ca94a0b5fec
parentdf339a11b55cc7d22823426440c7d19619a8858f
Merge branch 'tizen_5.5' into tizen

Change-Id: Ieecddd9d3380ae6f592d00316c6679da23bd2726
client/ma.c
include/multi_assistant.h