Merge remote-tracking branch 'origin/master' into tizen
authoradmin <tizenapi@samsung.com>
Fri, 17 May 2019 15:54:08 +0000 (15:54 +0000)
committeradmin <tizenapi@samsung.com>
Fri, 17 May 2019 15:54:08 +0000 (15:54 +0000)

Trivial merge