Merge branch 'devel/master (1.2.0)' into tizen 13/83213/1
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 12:02:47 +0000 (21:02 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 12:03:11 +0000 (21:03 +0900)
Change-Id: Ia802c3b17b32c21222ea6c8d9cd13d6ad6bc99ea


Trivial merge