Merge branch 'devel/master' into tizen 82/143982/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 06:38:19 +0000 (15:38 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 06:38:29 +0000 (15:38 +0900)
commit5469e2e206f4d9318a5dc435a0109eac4eb3cf84
tree14188d75558a8f5fdb1a295123c29a0c30394a88
parent07cf3dfddfc06130bb5598a0818b332f0d9a4175
parentb134e246fb1cd7d1f31f7cca5bfa33b6a559d7be
Merge branch 'devel/master' into tizen

Change-Id: I5ddb44d0163b6d48a1578ec92413d9348c32b2fa