Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 02:19:35 +0000 (11:19 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 02:19:46 +0000 (11:19 +0900)
commit5589fb626a4fc7792c6a8be9ca5718b887818354
tree3f1705890c51de9b475a76b733b680058fe931a2
parent57b130b8828b5c1ad7516d20cbcd6e020918466a
parent487dbc52b9fbe56f42abafc5ff5f09b54b79765f
Merge branch 'devel/master' into tizen

Change-Id: I8a592167076edbd1bca13d8fef0e85711112cbbd