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)
commitcc934fd7553fb979ed63ffb1a57aeb60f2a10718
tree362d1d98ffc267eb91ed2d0538058b031080b6f8
parent138b54266a305e3037de131e2ccfcab68bd9ecfe
parentbe48b3a59e82b51e68e020b8c0338721fe74d6b8
Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I8d542cf5fd6b5638273e917e123d25c87140b981