Merge branch 'devel/master (1.2.39+)' into tizen 55/129355/1 accepted/tizen/unified/20170518.061134 accepted/tizen/unified/20170518.061204 submit/tizen/20170517.061745 submit/tizen/20170517.083100
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 16 May 2017 07:17:54 +0000 (16:17 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 16 May 2017 07:19:07 +0000 (16:19 +0900)
Change-Id: I94210f256f2ecd2a1db1a9b32956da6f27cc6795


Trivial merge