Merge branch 'devel/master (1.2.0)' into tizen 08/83208/1
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 11:32:48 +0000 (20:32 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 11:34:01 +0000 (20:34 +0900)
Change-Id: Iafdbae903af3374dd58d83353a3af69da3b6da04


Trivial merge