Merge remote-tracking branch 'temp/master'
authorjunkyu han <junkyu.han@samsung.com>
Fri, 11 May 2018 09:37:17 +0000 (18:37 +0900)
committerjunkyu han <junkyu.han@samsung.com>
Fri, 11 May 2018 09:37:17 +0000 (18:37 +0900)

Trivial merge