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)
Change-Id: Ida6fec1f6183b5c47431c352a5955dc9f0616034


Trivial merge