Merge branch 'develop' into platform_3.0
authorjihye424.kim <jihye424.kim@samsung.com>
Thu, 22 Sep 2016 04:21:28 +0000 (13:21 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Thu, 22 Sep 2016 04:21:34 +0000 (13:21 +0900)
commitc938bf92bc42c0190ce1908e240fd60d951dc97f
treeab7f8b4948bacd314ab155f72b5c9e97091fe44a
parentcd7f27a5bbd75c5b006897491e108f40d9fcfa88
parent168fae707fb10068ea59795f3e4e49a59b2ef688
Merge branch 'develop' into platform_3.0

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