Merge branch 'master' into develop 65/126565/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:30:28 +0000 (16:30 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:30:33 +0000 (16:30 +0900)
Change-Id: Ie78e6661ca2090c5b8e60104872abeb751ed097b
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge