Merge branch 'devel/master' into tizen 34/143934/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 04:57:45 +0000 (13:57 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 04:57:54 +0000 (13:57 +0900)
Change-Id: Id7675c8f2ba06883eb6d5bc186511dc23a265bf2


Trivial merge