commit a3fc3e7c47aa1d8163cee7c0bd1a5c95f0c2fc2d
author Dale Sather <dalesat@google.com> Mon Nov 05 22:01:10 2018 +0000
committer Dale Sather <dalesat@google.com> Mon Nov 05 22:01:10 2018 +0000
tree 136807b8c91ae1f3650036d6f2b1acef28fa0686
parent 635bdae185e8df082e60c9e230f5087f8f89929a
parent 79bb5d6abc7181bc33e96a3da6089bb41d0bf557

Merge "Merge branch 'upstream/master'"

manifest/ffmpeg

diff --git a/manifest/ffmpeg b/manifest/ffmpeg
index adc5ae7..a651d71 100644
--- a/manifest/ffmpeg
+++ b/manifest/ffmpeg
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <imports>
-    <!-- TODO(jamesr): Remove, it should be possible to build things without garnet -->
     <import remote="https://fuchsia.googlesource.com/garnet"
-            manifest="manifest/minimal"
+            manifest="manifest/garnet"
             name="garnet"
-            revision="8aa4ce8a3382d9e8c87016d4acb165df3f6710bd"/>
-    <import remote="https://fuchsia.googlesource.com/build"
-            manifest="manifest/build"
-            name="build"
-            revision="5d6035d880d1eb4167ef547911de2cbfbc14d00e"/>
-    <import remote="https://fuchsia.googlesource.com/zircon"
-            manifest="manifest/zircon"
-            name="zircon"
-            revision="1e849439c99627b2b1d72a6329d30c7f5da3b742"/>
-    <import remote="https://fuchsia.googlesource.com/scripts"
-            manifest="manifest/scripts"
-            name="scripts"
-            revision="d43f9c3cdfb98cb4c0ad9dd9226f99288d6ab8ac"/>
+            revision="e558fa19d9178d5e61a650cfdc1a2afe6ae2292f"/>
     </imports>
     <projects>
       <project name="third_party/ffmpeg"