Merge branch 'openbox-internal' into openbox
* openbox-internal:
Remove manifest from manifest.
Add miracast project to manifest
Add vendor/qualcomm/switch
Add vendor/google/oregano
Add mindspeed toolchain.
Add vendor/broadcom/chromium
add barebox
Added vendor/opensource/pf_ring.
Add vendor/opensource/dial
Add vendor/qualcomm/drivers
Add uboot/mindspeed.
Add vendor/mindspeed/drivers
Add kernel/mindspeed
Add vendor/google/prism
Add toolchains/kvm.
Add vendor/ookla
Add ts_check project.
Merge prism.xml into default.xml.
Add vudu repo in default.xml.
Add a <manifest-server> URL so 'repo sync -s' will work.
Remove manifest from manifest.
Add vendor/broadcom/cfe-bin.
Add opensource/tarballs to prism.
Add manifest file for ONT(prism).
.
Conflicts:
default.xml
Change-Id: I021167e287f6e2055da6ee861f0bb169a342ad5a
diff --git a/default.xml b/default.xml
index 40fdc66..4a4aa5a 100644
--- a/default.xml
+++ b/default.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
- 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"/>
+ fetch="https://gfiber.googlesource.com/"
+ name="origin"
+ review="https://gfiber-review.googlesource.com/"/>
+ <default remote="origin" revision="master" sync-j="12"/>
<project name="toolchains/bruno"/>
<project name="toolchains/kvm"/>
