Merge branch 'develop' into features/new_ui
authorjihye424.kim <jihye424.kim@samsung.com>
Thu, 20 Aug 2015 03:22:51 +0000 (12:22 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Thu, 20 Aug 2015 03:25:41 +0000 (12:25 +0900)
commit67fa6f9239110762d81440337cfe0d7e39c3fa93
tree2c203affc2b82aa66dcacad84a2d52bab9211941
parent80d171fe88d62bb78a483a29daa4d4372abcc5c1
parent45505a90b88dd63ad5d260215f15d7e488ace6d3
Merge branch 'develop' into features/new_ui

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