Merge branch 'devel/master' into tizen 32/127832/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:10:56 +0000 (11:10 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:11:04 +0000 (11:11 +0900)
Change-Id: Ic64edf62a115136a5bb387f0eb7c8be8c6040ad3


Trivial merge