From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Tue, 7 Mar 2017 07:36:56 +0000 (+0900)
Subject: Merge branch 'devel/tizen' into tizen
X-Git-Tag: accepted/tizen/common/20170307.133939^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_wearable;p=platform%2Fcore%2Fapi%2Fmotion.git

Merge branch 'devel/tizen' into tizen

* devel/tizen:
  Disable the conflicting virtual package

Change-Id: I7adc5f75baf35947b3264ee1a14651491af5b004
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---

95bb0ad728d2cc2619c2185da285b6688b26a923