Merge branch 'devel/master' into tizen 04/133604/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:09:08 +0000 (11:09 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:09:17 +0000 (11:09 +0900)
Change-Id: I870581e0065ea9a692599dd899fa90dc48854a89


Trivial merge