Merge branch 'devel/master' into tizen 42/66642/1 accepted/tizen/common/20160427.144413 accepted/tizen/ivi/20160428.002736 accepted/tizen/mobile/20160428.004958 accepted/tizen/tv/20160428.002537 accepted/tizen/wearable/20160428.002827 submit/tizen/20160427.082119
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 20 Apr 2016 05:20:36 +0000 (14:20 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 20 Apr 2016 05:21:53 +0000 (14:21 +0900)
Change-Id: I8ea2d92322c8f9713328930cd3343c00573d21a8


Trivial merge