Merge branch 'master' into develop 39/128239/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Mon, 8 May 2017 07:15:44 +0000 (16:15 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Mon, 8 May 2017 07:15:49 +0000 (16:15 +0900)
Change-Id: Ica0cc6095b8903e34be71703f230902d728fcc41
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge