Merge branch 'devel/master' into tizen
authorJiyun Yang <ji.yang@samsung.com>
Thu, 22 Nov 2018 06:23:30 +0000 (15:23 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Thu, 22 Nov 2018 06:23:30 +0000 (15:23 +0900)
commit60048841059a8c4412ceb8aa1e5114a22eef7156
tree655233d65771237fc472adadfac8ba2fc2ade22f
parent8c4991f35ab4c63f4f9680e7a845c7e23cfcbc5c
parent8f8cfa1188d167e3a47743a7385bdf431594993a
Merge branch 'devel/master' into tizen