Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Thu, 17 May 2018 15:45:30 +0000 (00:45 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Thu, 17 May 2018 15:45:30 +0000 (00:45 +0900)

Trivial merge