projects / platform / core / api / context.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3626133 4463609)
Merge branch 'devel/tizen' into tizen 16/117716/1 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_wearable accepted/tizen/common/20170307.133942 accepted/tizen/ivi/20170307.102424 accepted/tizen/mobile/20170307.102334 accepted/tizen/unified/20170309.031700 accepted/tizen/wearable/20170307.102408 submit/tizen/20170307.063651 submit/tizen_unified/20170308.100404
authorMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 7 Mar 2017 07:37:23 +0000 (16:37 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 7 Mar 2017 07:37:23 +0000 (16:37 +0900)
* devel/tizen:
  Disable the conflicting virtual package

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

Trivial merge
Domain: Service Framework / Context;