Merge branch 'devel/master' into tizen 72/120972/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 02:26:48 +0000 (11:26 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 02:27:07 +0000 (11:27 +0900)
commit7c96e26a3f1ad64ee97c2b82a9ef3ff16ad520d0
treea4248e7892537c62baa433475df203fe6c0a9bcf
parent59f9eafb01cda464a9084e84e29b6957a686d779
parent63a744ae6695e1fc4a8ae46d342e982c1ec2eb67
Merge branch 'devel/master' into tizen

Change-Id: I3921da058fc98c712b86120a83a67a52e8a0781b