Merge branch 'master' into develop 66/126566/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:31:18 +0000 (16:31 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:31:22 +0000 (16:31 +0900)
Change-Id: Ief27bf7e7dbdb5798e2d4043a119959750f5b3e6
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge