Merge branch 'develop' into platform_3.0
authorjihye <jihye424.kim@samsung.com>
Wed, 28 Sep 2016 02:49:25 +0000 (11:49 +0900)
committerjihye <jihye424.kim@samsung.com>
Wed, 28 Sep 2016 02:49:38 +0000 (11:49 +0900)
commitf7db1c27d026a71a8e798ffdf8fe77394dc01556
treeaffe98f3a5750557d38b7145e2d3c1e65b73f911
parentc938bf92bc42c0190ce1908e240fd60d951dc97f
parent79aa7aeed2cbf343d465f42bdf4a8509e0546449
Merge branch 'develop' into platform_3.0

Change-Id: I8086efad4b832f488d1fa267d295f7b27ba42464
Signed-off-by: jihye <jihye424.kim@samsung.com>