Merge remote-tracking branch 'origin/master' into openbox-internal
* origin/master:
Add bmoca project.
Add vendor/marvell/manufacturing to the manifest
Add bluez
Conflicts:
default.xml
Change-Id: I42bc26aed2016dc264d82beaeb69e64a29b4613a
diff --git a/default.xml b/default.xml
index 3975926..794ccf7 100644
--- a/default.xml
+++ b/default.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
- fetch="https://gfiber.googlesource.com/"
- name="origin"
- review="https://gfiber-review.googlesource.com/"/>
- <default remote="origin" revision="master" sync-j="12"/>
+ fetch="https://gfiber-internal.googlesource.com/"
+ name="gfiber-internal"
+ review="https://gfiber-internal-review.googlesource.com/"/>
+ <default remote="gfiber-internal" revision="master" sync-j="12"/>
<project name="toolchains/bruno"/>
<project name="toolchains/kvm"/>
@@ -13,6 +13,7 @@
<project name="kernel/bruno"/>
<project name="kernel/prism"/>
<project name="buildroot"/>
+ <project name="vendor/broadcom/bmoca"/>
<project name="vendor/firmware"/>
<project name="vendor/humax/misc"/>
<project name="vendor/google/catawampus"/>
