Merge remote-tracking branch 'remotes/gfiber-internal/master' into master_merge
Conflicts:
default.xml
Change-Id: I7fadc567e9364c070539a5d2a735c1776051f3b3
diff --git a/default.xml b/default.xml
index 313f14f..653c27a 100644
--- a/default.xml
+++ b/default.xml
@@ -4,12 +4,14 @@
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"/>
+ <default remote="gfiber-internal" revision="prism_dev" sync-j="12"/>
<manifest-server
url="http://gfiber-autobot.mtv.corp.google.com:8000/manifest"/>
<project name="toolchains/bruno"/>
+ <project name="toolchains/prism"/>
<project name="kernel/bruno"/>
+ <project name="kernel/prism"/>
<project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
<project name="buildroot"/>
<project name="vendor/broadcom/alsa"/>
@@ -46,6 +48,7 @@
<project name="vendor/google/tvstreamparser"/>
<project name="vendor/google/mcastcapture"/>
<project name="vendor/google/widevine"/>
+ <project name="vendor/marvell/application"/>
<project name="vendor/netflix/nrd"/>
<project name="vendor/ookla"/>
<project name="vendor/opensource/ffmpeg"/>
@@ -58,4 +61,5 @@
<project name="vendor/sagetv/miniclient"/>
<project name="vendor/sagetv/pullreader"/>
<project name="vendor/skelmir/vm"/>
+ <project name="uboot/prism"/>
</manifest>
