Merge branch 'devel/master' into tizen 84/168684/1 sandbox/upgrade/efl120 accepted/tizen/unified/20180206.064208 submit/tizen/20180205.023347 submit/tizen/20180205.100518
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:48:07 +0000 (15:48 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:48:15 +0000 (15:48 +0900)
commit57ea2ae0019f00f1ef9858764b7baac6d62c4cd2
tree4136fd6fbcf21c9242a25dee7b4f2bfc3b4c1992
parentc5e5d3a8637bdb9f31bced4558943d2965fdd37c
parent36930d34cab20d644f872284c7d7b7ab5470a0b4
Merge branch 'devel/master' into tizen

Change-Id: I86a4b92b9dbbf954dde5c4b5ebe50ff3885bfa75