X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default.xml;h=46fb5cc310e776a9673dc37f14979c313e0dabff;hb=037bb3d267688a0e1764462df089a7b8bd566b27;hp=524d92093a7f488f695b7cb59459802081e83e7f;hpb=65d27c00516ff6cc453ab012401215aae40d2200;p=AGL%2FAGL-repo.git

diff --git a/default.xml b/default.xml
index 524d9209..46fb5cc3 100644
--- a/default.xml
+++ b/default.xml
@@ -56,7 +56,7 @@
   <project name="meta-ti" path="meta-ti" remote="yocto" revision="krogoth" />
 
   <!-- iotivity -->
-  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.2.0" />
+  <project name="meta-oic" path="meta-oic" remote="yocto" revision="0bdd959e0dee4f63098702c302d1d214ac3d808a" />
 
   <!-- meta-amb -->
   <project name="tripzero/meta-amb" path="meta-amb" remote="github" revision="master" />
@@ -71,7 +71,8 @@
   <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="krogoth" />
 
   <!-- Image Security Analysis FrameWork (isafw) -->
-  <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="master" />
+  <!-- use morty branch for CC and DD - conflicting changes in master-->
+  <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="morty" />
 
   <!-- IoT Security layer -->
   <project name="meta-intel-iot-security" path="meta-intel-iot-security" remote="01org" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />