Merge branch 'devel/master' into tizen 55/133555/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 01:34:06 +0000 (10:34 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 01:34:24 +0000 (10:34 +0900)
commitf797020286aa82bac8afdd6a8c0fb6dcb2326781
tree35692429c337848adf96062a186dd122cbab239e
parentbf46431ba2ac272e310627d6fd3fb706e96a24b3
parent0b16bcc14835561a27844e2c57f2cc57eb636901
Merge branch 'devel/master' into tizen

Change-Id: Ida6fec1f6183b5c47431c352a5955dc9f0616034