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)
commit3fbccc1fb1635563b544bd28533b879aa552861d
treeb1c78a2a75fc0155f7db32f66c5b3ae4940a5e47
parent5626d829fb2752f8b7a9a1f7ed562457ecd85012
parent18b0c220f9b6f01d29f9726a44b42827601b4e82
Merge branch 'master' into develop

Change-Id: Ie78e6661ca2090c5b8e60104872abeb751ed097b
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>