Merge remote-tracking branch 'userland/master' into tizen
authorHackseung Lee <lhs@dignsys.com>
Tue, 31 Oct 2017 23:20:38 +0000 (08:20 +0900)
committerHackseung Lee <lhs@dignsys.com>
Tue, 31 Oct 2017 23:20:38 +0000 (08:20 +0900)
Signed-off-by: Hackseung Lee <lhs@dignsys.com>

Trivial merge