Merge branch 'devel/master' into tizen 82/168682/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:46:28 +0000 (15:46 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:46:38 +0000 (15:46 +0900)
commit5faabb30ab7b8bb4eba6609bea612f5302207c75
tree861b451258f62d7b2d83c523322aca928e4f31f6
parente684420bc9bb8d51ae033f8fb1be4c9242376f3d
parent3ef464ce8916c3714998c0e1ace1b6d4b5d090bc
Merge branch 'devel/master' into tizen

Change-Id: Ic65a654ecc9a71295e2f880e8fbbd3b140db6151