Merge branch 'devel/master' into tizen 56/66456/1 accepted/tizen/common/20160427.144351 accepted/tizen/ivi/20160428.002713 accepted/tizen/mobile/20160428.004938 accepted/tizen/tv/20160428.002515 accepted/tizen/wearable/20160428.002803 submit/tizen/20160427.082119
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 04:52:46 +0000 (13:52 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Apr 2016 04:54:36 +0000 (13:54 +0900)
Change-Id: I36cabe6296fb69fb39f22c4efcb9da41a8f16be9


Trivial merge