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

Merge branch 'devel/tizen' into tizen

* devel/tizen:
  Disable the conflicting virtual package

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

106c5c4de7fdf6c77410cd88ed9fb37253fe0675