Merge branch 'devel/master' into tizen 22/127822/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:03:11 +0000 (11:03 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:03:18 +0000 (11:03 +0900)
commitc1cd9d16cb5667addce02d557cedce25d8a95117
tree540ad2139277518bfaf5eb54167e5c186cce8622
parent9fe919bc1c0a1f05bd44a1d37a52aeeea20cf8e4
parentfa60170358d01b725ed2ac8500423f228830fe5c
Merge branch 'devel/master' into tizen

Change-Id: Id974a7516eae1395af2db4c247180f90f4d1ac41