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)
Change-Id: I1f8e678f96f49ddde05e85cdbad1a357ef8ef100


Trivial merge