From: heewon Park <h_w.park@samsung.com>
Date: Thu, 28 Mar 2019 11:01:34 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/master' into EDGE-238
X-Git-Tag: submit/tizen/20190409.085658~9^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95f4da89021c047009e671df4fc306fb1e7c71e8;p=platform%2Fcore%2Fsystem%2Fedge-orchestration.git

Merge remote-tracking branch 'origin/master' into EDGE-238

# Conflicts:
#	src/CMain/inc/orchestration.h
---

95f4da89021c047009e671df4fc306fb1e7c71e8