Merge branch 'devel/master (1.2.36+)' into tizen 31/126831/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 06:29:58 +0000 (15:29 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 06:30:25 +0000 (15:30 +0900)
Change-Id: I02bd0acfb1c23ad694b517af34ece69c200d87a6


Trivial merge