Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Wed, 12 Dec 2018 15:05:57 +0000 (15:05 +0000)
committerTizenAPI-Bot <tizenapi@samsung.com>
Wed, 12 Dec 2018 15:05:57 +0000 (15:05 +0000)

Trivial merge