Merge branch 'devel/master (1.2.36+)' into tizen 43/126843/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 06:45:35 +0000 (15:45 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 06:45:57 +0000 (15:45 +0900)
Change-Id: I8d542cf5fd6b5638273e917e123d25c87140b981


Trivial merge