Merge branch 'devel/master(1.1.39)' into tizen 15/75415/1
authortaeyoon <taeyoon0.lee@samsung.com>
Sat, 18 Jun 2016 04:58:54 +0000 (13:58 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Sat, 18 Jun 2016 04:59:29 +0000 (13:59 +0900)
commite7878fb7f5539e31c9220b98c62c2ffcbbdae59e
treec98ee128c73406a07c8811c0023ab524bf891b85
parent3b23345a0f1d25d20f5b1d7fd051406d45ea1042
parentfc15ec07d0937a073085cfb763ba5d15c6ddbe1c
Merge branch 'devel/master(1.1.39)' into tizen

Change-Id: I171f5248ddfb7c81b2b7c841e37e17e6372fd1ce