Merge remote-tracking branch 'origin/master' into openbox-internal
* origin/master:
Revert "Add Google miracast project to manifest"
Add Google miracast project to manifest
Add vendor/google/tarballs
Move /vendor/broadcom/cfe-bin to /loader-bin
Add vendor/mindspeed/loader-bin
Added loader-bin project
Change default revision to absolute path
Conflicts:
default.xml
Change-Id: I182b63786d2efe76533d88ae4ffabd08280d106d
diff --git a/default.xml b/default.xml
index 794ccf7..ef95525 100644
--- a/default.xml
+++ b/default.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
- fetch="https://gfiber-internal.googlesource.com/"
name="gfiber-internal"
+ fetch="https://gfiber-internal.googlesource.com/"
review="https://gfiber-internal-review.googlesource.com/"/>
- <default remote="gfiber-internal" revision="master" sync-j="12"/>
+ <default
+ remote="gfiber-internal"
+ revision="refs/heads/master"
+ sync-j="12"/>
<project name="toolchains/bruno"/>
<project name="toolchains/kvm"/>