Merge branch 'devel/masteri (1.2.36+)' into tizen 52/126752/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 04:48:04 +0000 (13:48 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 04:50:11 +0000 (13:50 +0900)
Change-Id: I1bf7a699452ea0f549f53c3580bc875d8f17775c


Trivial merge