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)
commit90d6335a8d5a806e166ba218a8f6bc2d794c85c5
treec238b3391db0a8e5eaea791e70cc86fc5a9b2d04
parent1819eb84a9a13f14550a4f35c7694fb6454feeba
parent3daf6de364bc2f66277f6a0fb7eab33973368a13
Merge branch 'devel/master (1.2.0)' into tizen

Change-Id: Ia802c3b17b32c21222ea6c8d9cd13d6ad6bc99ea