Merge branch 'devel/master (1.2.49)' into tizen 52/140152/1 accepted/tizen/4.0/unified/20170816.013904 accepted/tizen/4.0/unified/20170816.020249 accepted/tizen/unified/20170727.191515 submit/tizen/20170725.060315 submit/tizen/20170725.110106 submit/tizen/20170726.063443 submit/tizen/20170727.071110 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0_unified/20170814.115522
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:48:12 +0000 (12:48 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:48:40 +0000 (12:48 +0900)
Change-Id: Iab84a1ceaa5ca7bec289cd316d62587cc52b4429


Trivial merge