Merge branch 'devel/master' into tizen 40/120940/1 accepted/tizen/common/20170327.143307 accepted/tizen/ivi/20170328.060422 accepted/tizen/mobile/20170328.060055 accepted/tizen/tv/20170328.060221 accepted/tizen/unified/20170328.060511 accepted/tizen/wearable/20170328.060330 submit/tizen/20170327.130356
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 01:38:36 +0000 (10:38 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 01:38:52 +0000 (10:38 +0900)
commit5423c4b15c35798056e3f6a3af8d0275105e9517
tree4d3397ca4823e90de319b4e04700d0e3c74d9aa6
parenta604fd9e2f91864cce97555051c9b500b2a09344
parentb7a7a9dcb8c4effcc0bff371d8cb601b9db6baeb
Merge branch 'devel/master' into tizen

Change-Id: I1f8e678f96f49ddde05e85cdbad1a357ef8ef100