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)
commit106c5c4de7fdf6c77410cd88ed9fb37253fe0675
tree0009dc8693c5eb9409631e6d2fcb0ba0089724c5
parent3626133f7874b79c8450d9b41afcc9fbdca6eb78
parent4463609a0b469738a6bd0500ad104a67efc29293
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>