Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Fri, 11 May 2018 02:05:02 +0000 (11:05 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Fri, 11 May 2018 02:05:02 +0000 (11:05 +0900)

Trivial merge