diff --git a/.gitignore b/.gitignore
index 7cfd664..51706b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,10 @@
 .idea/
 .gradle/
 android-data*/
-tests/art.tar.gz
-tests/art
+tests/2016-12-19/art.tar.gz
+tests/2016-12-19/art
+tests/2017-07-07/art.tar.gz
+tests/2017-07-07/art
 tmp/
 tools/*.pyc
 tools/*/art
diff --git a/build.gradle b/build.gradle
index d8a2561..99c4865 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,8 @@
 
 def cloudDependencies = [
         "tests"      : [
-                "art.tar.gz"
+                "2017-07-07/art.tar.gz",
+                "2016-12-19/art.tar.gz"
         ],
         "third_party": [
                 "android_jar/lib-v14.tar.gz",
@@ -365,7 +366,7 @@
 task createArtTests(type: Exec) {
     def outputDir = "build/generated/test/java/com/android/tools/r8/art"
     def createArtTestsScript = "tools/create_art_tests.py"
-    inputs.file "tests/art.tar.gz"
+    inputs.file "tests/2017-07-07/art.tar.gz"
     inputs.file createArtTestsScript
     outputs.dir outputDir
     dependsOn downloadDeps
@@ -824,8 +825,14 @@
 // 2. run the following commands in the Android checkout directory:
 //
 //    source build/envsetup.sh
-//    lunch aosp_angler-userdebug
-//    make -j30 test-art-host
+//    lunch aosp_angler-userdebug # or lunch aosp_angler-eng
+//    m desugar
+//    m -j30 test-art-host
+//    DESUGAR=false ANDROID_COMPILE_WITH_JACK=false art/test.py --host -t 001-HelloWorld
+//
+//    Without running the test.py command the classes.jar file used by desugar in
+//    $HOME/android/master/out/host/common/obj/JAVA_LIBRARIES/core-oj-hostdex_intermediates/
+//    seems to be missing - there is probably also a make target to build it more directly
 //
 // 3. In the R8 project root directory, make sure we have a clean state before starting:
 //    tools/gradle.py downloadDeps
@@ -833,10 +840,12 @@
 //    rm -rf tests/art
 //
 // 4. Now build in the R8 checkout (-P hack to not generate dirs when not running this target)
-//    Make sure you have smali on your path, there is a build binary in the out directory of
-//    the android checkout:
+//    Make sure you have smali on your path, please use the build binary in the
+//    out/host/linux-x86/bin directory of the android checkout. Currently this is version pre 2.2.1,
+//    if that is updated the call to smali in "task "${smaliToDexTask}"(type: Exec)" below might
+//    need to change as smali got a completely new command line interface in version 2.2.1.
 //
-//    tools/gradle.py -Pandroid_source buildArtTests
+//    PATH=$HOME/android/master/out/host/linux-x86/bin:$PATH tools/gradle.py -Pandroid_source buildArtTests
 //
 // 4a. If any failures are produced in step 4, figure out what went wrong and add an entry in
 //     skippedTests with an explanation. Rerun from step 3.
@@ -845,13 +854,16 @@
 //    tools/gradle.py clean
 //    tools/test.py
 //
-// 5a. If any more tests fail, either fix the issue or add them to the toBeTriaged list (note that
-//     you need to change "_" to "-" from stdout). Rerun from step 3 if anything was added to
-//     toBeTriaged.
+// 5a. If any more tests fail, either fix the issue or add them to the failuresToTriage list (note
+//     that you need to change "_" to "-" from stdout). Rerun from step 5 if anything was added to
+//     failuresToTriage.
 //
-// 6. To upload a new version to Google Cloud Storage
+// 6. To upload a new version to Google Cloud Storage:
 //    cd tests
 //    upload_to_google_storage.py -a --bucket r8-deps art
+//
+// 7. Update the manifest file describing the Android repo used:
+//    repo manifest -o <r8-checkout-root>/tools/linux/aosp_master_manifest.xml -r
 
 enum DexTool {
     JACK,
@@ -1019,7 +1031,7 @@
     def dexMergerExecutable = Utils.dexMergerExecutable()
     def dexToolName = dexTool == DexTool.DX ? "dx" : "jack"
 
-    def name = dir.getName();
+    def name = dir.getName()
     def buildTask = "build_art_test_${dexToolName}_${name}"
     def sanitizeTask = "sanitize_art_test_${dexToolName}_${name}"
     def copyCheckTask = "copy_check_art_test_${dexToolName}_${name}"
@@ -1041,6 +1053,7 @@
             args "${name}"
             environment DX: "${dxExecutable.absolutePath}"
             environment DXMERGER: "${dexMergerExecutable.absolutePath}"
+            environment ANDROID_BUILD_TOP: "${androidCheckoutDir}"
             outputs.file outputJar
         }
     } else {
@@ -1074,7 +1087,11 @@
     task "${smaliToDexTask}"(type: Exec) {
         workingDir "${testDir}/smali"
         executable "/bin/bash"
-        args "-c", "smali -o out.dex *.smali"
+        // This is the command line options for smali prior to 2.2.1, where smali got a new
+        // command line interface.
+        args "-c", "smali a *.smali"
+        // This is the command line options for smali 2.2.1 and later.
+        // args "-c", "smali -o out.dex *.smali"
     }
 
     task "${copyCheckTask}"(type: Copy, dependsOn: sanitizeTask) {
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index d2dec66..aa4c482 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -75,8 +75,10 @@
     R8_AFTER_D8 // refers to the R8 (default: debug) step but implies a previous D8 step as well
   }
 
-  private static final String ART_TESTS_DIR = "tests/art";
-  private static final String ART_TESTS_NATIVE_LIBRARY_DIR = "tests/art/lib64";
+  private static final String ART_TESTS_DIR = "tests/2017-07-07/art";
+  private static final String ART_LEGACY_TESTS_DIR = "tests/2016-12-19/art/";
+  private static final String ART_TESTS_NATIVE_LIBRARY_DIR = "tests/2017-07-07/art/lib64";
+  private static final String ART_LEGACY_TESTS_NATIVE_LIBRARY_DIR = "tests/2016-12-19/art/lib64";
 
   // Input jar for jctf tests.
   private static final String JCTF_COMMON_JAR = "build/libs/jctfCommon.jar";
@@ -102,6 +104,8 @@
           .put("044-proxy", Constants.ANDROID_N_API)
           // Test intentionally asserts absence of default interface method in a class.
           .put("048-reflect-v8", Constants.ANDROID_N_API)
+          // Uses default interface methods.
+          .put("616-cha-interface-default", Constants.ANDROID_N_API)
           // Interface initializer is not triggered after desugaring.
           .put("962-iface-static", Constants.ANDROID_N_API)
           // Interface initializer is not triggered after desugaring.
@@ -346,11 +350,14 @@
       "597-deopt-new-string",
       "616-cha",
       "616-cha-abstract",
+      "616-cha-interface",
+      "616-cha-interface-default",
+      "616-cha-miranda",
       "616-cha-regression-proxy-method",
       "616-cha-native",
+      "616-cha-proxy-method-inline",
       "626-const-class-linking",
       "626-set-resolved-string",
-      "629-vdex-speed",
       "900-hello-plugin",
       "901-hello-ti-agent",
       "1337-gc-coverage"
@@ -705,7 +712,46 @@
                   .build())
           .build();
 
-  private static List<String> failuresToTriage = ImmutableList.of();
+  private static List<String> failuresToTriage = ImmutableList.of(
+      // This is flaky.
+      "104-growth-limit",
+
+      // Various failures.
+      "138-duplicate-classes-check",
+      "461-get-reference-vreg",
+      "629-vdex-speed",
+      "638-no-line-number",
+      "647-jni-get-field-id",
+      "649-vdex-duplicate-method",
+      "652-deopt-intrinsic",
+      "655-jit-clinit",
+      "656-annotation-lookup-generic-jni",
+      "656-loop-deopt",
+      "708-jit-cache-churn",
+
+      // These use "native trace".
+      "981-dedup-original-dex",
+      "982-ok-no-retransform",
+      "983-source-transform-verify",
+      "984-obsolete-invoke",
+      "985-re-obsolete",
+      "986-native-method-bind",
+      "987-agent-bind",
+      "988-method-trace",
+      "989-method-trace-throw",
+      "990-field-trace",
+      "991-field-trace-2",
+      "992-source-data",
+      "993-breakpoints",
+      "994-breakpoint-line",
+      "995-breakpoints-throw",
+      "996-breakpoint-obsolete",
+      "997-single-step",
+
+      // These two fail with missing *-hostdex.jar files.
+      "648-inline-caches-unresolved",
+      "998-redefine-use-after-free"
+  );
 
   private static class TestSpecification {
 
@@ -811,9 +857,12 @@
     return set;
   }
 
-  private static Map<SpecificationKey, TestSpecification> get_tests_map(
-      CompilerUnderTest compilerUnderTest, CompilationMode compilationMode) {
+  private static Map<SpecificationKey, TestSpecification> getTestsMap(
+      CompilerUnderTest compilerUnderTest, CompilationMode compilationMode, DexVm version) {
     File artTestDir = new File(ART_TESTS_DIR);
+    if (version != DexVm.ART_DEFAULT) {
+      artTestDir = new File(ART_LEGACY_TESTS_DIR);
+    }
     if (!artTestDir.exists()) {
       // Don't run any tests if the directory does not exist.
       return Collections.emptyMap();
@@ -941,6 +990,9 @@
     if (specification.nativeLibrary != null) {
       // All the native libraries for all Art tests is in the same directory.
       File artTestNativeLibraryDir = new File(ART_TESTS_NATIVE_LIBRARY_DIR);
+      if (artVersion != DexVm.ART_DEFAULT) {
+        artTestNativeLibraryDir = new File(ART_LEGACY_TESTS_NATIVE_LIBRARY_DIR);
+      }
       builder.appendArtSystemProperty(
           "java.library.path",
           artTestNativeLibraryDir.getAbsolutePath());
@@ -1270,12 +1322,18 @@
     CompilationMode compilationMode = defaultCompilationMode(compilerUnderTest);
 
     TestSpecification specification =
-        get_tests_map(firstCompilerUnderTest, compilationMode)
+        getTestsMap(firstCompilerUnderTest, compilationMode, version)
             .get(new SpecificationKey(name, toolchain));
 
     if (specification == null) {
-      throw new RuntimeException("Test " + name + " has no specification for toolchain"
-          + toolchain + ".");
+      if (version == DexVm.ART_DEFAULT) {
+        throw new RuntimeException("Test " + name + " has no specification for toolchain"
+            + toolchain + ".");
+      } else {
+        // For older VMs the test might not exist, as the tests are currently generates from the
+        // directories present in the art test directory for AOSP master.
+        return;
+      }
     }
 
     if (specification.skipTest) {
@@ -1317,7 +1375,7 @@
     if (compilerUnderTest == CompilerUnderTest.R8_AFTER_D8) {
       compilationMode = CompilationMode.DEBUG;
       specification =
-          get_tests_map(CompilerUnderTest.R8_AFTER_D8, compilationMode)
+          getTestsMap(CompilerUnderTest.R8_AFTER_D8, compilationMode, version)
               .get(new SpecificationKey(name, DexTool.DX));
 
       if (specification == null) {
diff --git a/tests/art.tar.gz.sha1 b/tests/2016-12-19/art.tar.gz.sha1
similarity index 97%
rename from tests/art.tar.gz.sha1
rename to tests/2016-12-19/art.tar.gz.sha1
index 7b25f2d..de41164 100644
--- a/tests/art.tar.gz.sha1
+++ b/tests/2016-12-19/art.tar.gz.sha1
@@ -1 +1 @@
-f1bbc107dd620d63f3b3504fde9b9b219df40dfa
\ No newline at end of file
+f1bbc107dd620d63f3b3504fde9b9b219df40dfa
diff --git a/tests/2017-07-07/aosp_master_manifest.xml b/tests/2017-07-07/aosp_master_manifest.xml
new file mode 100644
index 0000000..85c7b5c
--- /dev/null
+++ b/tests/2017-07-07/aosp_master_manifest.xml
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
+  
+  <default remote="aosp" revision="master" sync-j="4"/>
+  
+  <project groups="device,fugu,broadcom_pdk,pdk" name="device/asus/fugu" revision="80ed1ee63bc5b4480cf18925ac644517b97f3179" upstream="master"/>
+  <project clone-depth="1" groups="device,fugu,broadcom_pdk,pdk" name="device/asus/fugu-kernel" revision="8a09131453b9326793261b6c9297f3c43336d6b5" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk" name="device/common" revision="81fa95978b5542b9d2851b04d034b9a75ed8b43b" upstream="master"/>
+  <project groups="pdk" name="device/generic/arm64" revision="23d9a6b57c63fbea914ae663a0be693b43d91ffc" upstream="master"/>
+  <project groups="pdk" name="device/generic/armv7-a-neon" revision="dd168c481dcb14c7932c7026ac7c8b4af128e4a5" upstream="master"/>
+  <project groups="pdk" name="device/generic/common" revision="11c092a6cbfcf6207f07a9a8e3398e747e7f5461" upstream="master"/>
+  <project groups="pdk" name="device/generic/goldfish" revision="eb66ec9609a6c6422cfec97074eaefe9b3b436cd" upstream="master"/>
+  <project groups="pdk" name="device/generic/goldfish-opengl" revision="b0a0e2f0297a1b379dd460dbb74153773196238c" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-arm64" revision="6f2e6974a1b1dc0ef936aec732e33d553c000b5e" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-armv7-a-neon" revision="9d7cbb60819a1da8408a7148b965b4cd1ebbb570" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-mips" revision="544e69736cff911c286a5d1d300dac228e23a73f" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-mips64" revision="b1c36d0847fe6366527efd38fdb29d757ea887ee" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-x86" revision="65d59e2be2cfd713513a05d80a0f75794ab60579" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-x86_64" revision="bcb1f5139c24bebbb0cc0ebd2f50d83cd21b01b9" upstream="master"/>
+  <project groups="pdk" name="device/generic/mips" revision="23901a9cf7a62f5f8f9f0c1382b5707694a1661c" upstream="master"/>
+  <project groups="pdk" name="device/generic/mips64" revision="03b4192ab5125e5d67636dc4c7121f089799e1fb" upstream="master"/>
+  <project groups="pdk" name="device/generic/qemu" revision="99feb6138f39e392495057ef7f2c4a5ed27f9e2d" upstream="master"/>
+  <project groups="device,pdk" name="device/generic/uml" revision="c2e8fa7d294d2b83bbe6054dd7b94139517e8637" upstream="master"/>
+  <project groups="pdk" name="device/generic/x86" revision="dac918b4cd4a34342526588502e4b5a531183080" upstream="master"/>
+  <project groups="pdk" name="device/generic/x86_64" revision="f00aa59b3af4937ed014701755e9b01c95122187" upstream="master"/>
+  <project groups="device,pdk" name="device/google/accessory/arduino" revision="abc5159a3ca9dbb5c7e364a1eab99901a4440ac5" upstream="master"/>
+  <project groups="device,pdk" name="device/google/accessory/demokit" revision="7dfe7f89a3b174709c773fe319531006e46440d9" upstream="master"/>
+  <project groups="device,fugu,broadcom_pdk,generic_fs,pdk" name="device/google/atv" revision="fbc45fb7c00d9b0150acdb674c9525ab32abe349" upstream="master"/>
+  <project groups="device,pdk" name="device/google/contexthub" revision="fd765cf358dba4be60b62ee068d6d0cc41674319" upstream="master"/>
+  <project groups="device,dragon,pdk" name="device/google/dragon" revision="0c29277c7842d8fe7b6ba49b2af35196030f093b" upstream="master"/>
+  <project clone-depth="1" groups="device,dragon,pdk" name="device/google/dragon-kernel" revision="8c9e4d14540119e0815a453eb4fefbedeaf8794f" upstream="master"/>
+  <project groups="device,marlin" name="device/google/marlin" revision="d5980c0fc2b2f63bf2b3efc94f527e6fb5cf594c" upstream="master"/>
+  <project clone-depth="1" groups="device,marlin" name="device/google/marlin-kernel" revision="48bde4626f5da9605b068b6c1bcc1e854a876d52" upstream="master"/>
+  <project groups="device,angler,broadcom_pdk,pdk" name="device/huawei/angler" revision="602d56d59460ce359dccaa418687bbe95a0619bb" upstream="master"/>
+  <project clone-depth="1" groups="device,angler,broadcom_pdk,pdk" name="device/huawei/angler-kernel" revision="db808069857bd03e573ce3c765dd6df43f2a4318" upstream="master"/>
+  <project groups="device,bullhead,pdk" name="device/lge/bullhead" revision="45cfd5d7594c92ff992e35f80c115b3db06f5d8a" upstream="master"/>
+  <project clone-depth="1" groups="device,bullhead,pdk" name="device/lge/bullhead-kernel" revision="3f270065c17302930cc9319d399297436b65b3bc" upstream="master"/>
+  <project name="device/linaro/bootloader/OpenPlatformPkg" revision="71183d6eabb1f91198f1bd3705a85b419cfd4685" upstream="master"/>
+  <project name="device/linaro/bootloader/arm-trusted-firmware" revision="36aa82dda56169333aba6b2c55341404c1d631f0" upstream="master"/>
+  <project name="device/linaro/bootloader/edk2" revision="b26de945921c8045494d7817e2c962b2b73c80dc" upstream="master"/>
+  <project groups="device,hikey,pdk" name="device/linaro/hikey" revision="14fc8793687878c840f48f6c6c7a4d00aa628c16" upstream="master"/>
+  <project clone-depth="1" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" revision="60b637267e3d3b5140590649651c7033375aafb7" upstream="master"/>
+  <project groups="pdk" name="device/sample" revision="15f7857fc7b7f7cfd99ec4f93b151dc02a71b837" upstream="master"/>
+  <project name="kernel/tests" revision="a32e3eadb010ed3143bcebe0b588678b7627884b" upstream="master"/>
+  <project groups="pdk" name="platform/art" path="art" revision="d64fbfa3471c47d6628d6014bc4a3ac780abd26a" upstream="master"/>
+  <project groups="pdk" name="platform/bionic" path="bionic" revision="f45bc14d5497c30bd43e22d025e3b88812b2baa4" upstream="master"/>
+  <project groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" revision="c8e338fa9c19e3a017a9641035279c23e5c57d8d" upstream="master"/>
+  <project groups="pdk" name="platform/build" path="build/make" revision="5e19557eb99d75ca37a2fbbfb992c135f080bf0a" upstream="master">
+    <copyfile dest="Makefile" src="core/root.mk"/>
+    <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk"/>
+    <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default"/>
+    <linkfile dest="build/core" src="core"/>
+    <linkfile dest="build/envsetup.sh" src="envsetup.sh"/>
+    <linkfile dest="build/target" src="target"/>
+    <linkfile dest="build/tools" src="tools"/>
+  </project>
+  <project groups="pdk,tradefed" name="platform/build/blueprint" path="build/blueprint" revision="8d20586d568d04037c258a25a5350676276351ab" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/build/kati" path="build/kati" revision="bcb31defde3e3fc248a1f11049e7722233003b6f" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/build/soong" path="build/soong" revision="36242850fdad11b4e6fbe061ef30f62e7e8c08d8" upstream="master">
+    <linkfile dest="Android.bp" src="root.bp"/>
+    <linkfile dest="bootstrap.bash" src="bootstrap.bash"/>
+  </project>
+  <project groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" revision="644a1933b78f1b08e86cecb58e199cd43ff7bd26" upstream="master"/>
+  <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" revision="724940ddcf92145c33290f2194e996b5b2cb7f57" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" revision="466473ac872cbc6a37815458d2149c41d54ce52e" upstream="master"/>
+  <project name="platform/developers/build" path="developers/build" revision="67343aa8a5faeb6b4df459dbfce4cc17bc7f21f9" upstream="master"/>
+  <project name="platform/developers/demos" path="developers/demos" revision="95d49d216223e3431647abd79f5e376958353c95" upstream="master"/>
+  <project name="platform/developers/samples/android" path="developers/samples/android" revision="b329d0bb80feecf6a27d38fe0bb3c018a2ba16aa" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/development" path="development" revision="37c32c31621339af71b62dbc7986358ed629083e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/docs/source.android.com" path="docs/source.android.com" revision="14605d77b5e0aabc741b2b69d53e9e772f010b23" upstream="master"/>
+  <project groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" revision="7a8860406c015bbc63f382efed9372044eb0cb74" upstream="master"/>
+  <project groups="pdk" name="platform/external/Microsoft-GSL" path="external/Microsoft-GSL" revision="44079759f93259a9694607502406dfe3717b04ba" upstream="master"/>
+  <project groups="pdk" name="platform/external/aac" path="external/aac" revision="db596910262534891ecde361a71abe7ada57405a" upstream="master"/>
+  <project groups="pdk" name="platform/external/abi-compliance-checker" path="external/abi-compliance-checker" revision="c692633e1b2dddfb8f5ec7f60eb7a62ced325e4f" upstream="master"/>
+  <project groups="pdk" name="platform/external/abi-dumper" path="external/abi-dumper" revision="9b76336c02d84eeea19a48108270e3bae4efd025" upstream="master"/>
+  <project groups="pdk" name="platform/external/android-clat" path="external/android-clat" revision="e700a73dd03a0c111a8a55ef2f9f22b264663138" upstream="master"/>
+  <project groups="pdk" name="platform/external/androidplot" path="external/androidplot" revision="c66727ebf001607cee14521c35bc852b55fd9845" upstream="master"/>
+  <project groups="pdk" name="platform/external/ant-glob" path="external/ant-glob" revision="a73228afa9540b9c5518d360c5ae630bb634f975" upstream="master"/>
+  <project groups="pdk" name="platform/external/antlr" path="external/antlr" revision="dd5fa6d48b827c5d98b625adbc209f4a05567534" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-commons-math" path="external/apache-commons-math" revision="18f62fca59d387e3c1ccd8f80087d9c9af40bcc8" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-harmony" path="external/apache-harmony" revision="a0527d8a473efb03b95e3402127974c0523b596e" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-http" path="external/apache-http" revision="a4b31e5eda3df5a0ffe844891edc5bbb33930e98" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-xml" path="external/apache-xml" revision="31d7642eb8f37a9166db7f1c9e313ab651bdb8ba" upstream="master"/>
+  <project groups="pdk" name="platform/external/archive-patcher" path="external/archive-patcher" revision="66e3a02481a0fcfcaaea296c0ec4daf761d3a07c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/external/autotest" path="external/autotest" revision="93023b12440976e4b620d5d33af1928288c97dc2" upstream="master"/>
+  <project groups="pdk" name="platform/external/avb" path="external/avb" revision="047ecf7d2361ffcb39a5a4ec0709480f47ed76e2" upstream="master"/>
+  <project groups="pdk" name="platform/external/bison" path="external/bison" revision="7467d52af437dd3dfea237a6865ab84bf258dee0" upstream="master"/>
+  <project groups="pdk" name="platform/external/blktrace" path="external/blktrace" revision="d345431f16b8f76f30a58193ff2b26d5853e1109" upstream="master"/>
+  <project groups="pdk" name="platform/external/boringssl" path="external/boringssl" revision="e56da3e0a18add8be1571c4ae616492a0258ebea" upstream="master"/>
+  <project groups="pdk" name="platform/external/bouncycastle" path="external/bouncycastle" revision="6ec33a667cad9a33e8049206a0507fcece28fd9c" upstream="master"/>
+  <project groups="pdk" name="platform/external/brotli" path="external/brotli" revision="7e4c269545df05725341167068c54b55b7d03370" upstream="master"/>
+  <project groups="pdk" name="platform/external/bsdiff" path="external/bsdiff" revision="61a6197566d4230c9a86a61e6c5f605778ab3733" upstream="master"/>
+  <project groups="pdk" name="platform/external/bzip2" path="external/bzip2" revision="0600e5668b2b1590c2f908a5c420149c6581122e" upstream="master"/>
+  <project groups="pdk" name="platform/external/c-ares" path="external/c-ares" revision="211489aeaed3157c34e46f350afea813960258af" upstream="master"/>
+  <project groups="pdk" name="platform/external/caliper" path="external/caliper" revision="eef51080212521ca9c85eb880dd1d6620846cf92" upstream="master"/>
+  <project groups="pdk" name="platform/external/cblas" path="external/cblas" revision="d7e8ee81279845e0f06103398b48d3f4624497b4" upstream="master"/>
+  <project groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" revision="5bb2c7930cf34cfe7584b76139b5257feec81e6c" upstream="master"/>
+  <project groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" revision="a70bd790dfd509cefb24534d02e3a1b349faf98d" upstream="master"/>
+  <project groups="pdk" name="platform/external/chromium-webview" path="external/chromium-webview" revision="581a777a866d78be6cb4192e46891e418930fc1b" upstream="master"/>
+  <project groups="pdk" name="platform/external/clang" path="external/clang" revision="0f9f1869a4596b973fb6d65324924365d3cf5884" upstream="master"/>
+  <project groups="pdk" name="platform/external/cmockery" path="external/cmockery" revision="9199c7bfafefea32d1884182fa655b6e4578c1c4" upstream="master"/>
+  <project groups="pdk" name="platform/external/compiler-rt" path="external/compiler-rt" revision="8bdaf98eeb4dd0f7b8cae390cd18c097a9eb4e2f" upstream="master"/>
+  <project groups="pdk" name="platform/external/conscrypt" path="external/conscrypt" revision="bd086d9c0704b340879f925741567e5a6610b333" upstream="master"/>
+  <project groups="pdk" name="platform/external/crcalc" path="external/crcalc" revision="5559610bea3b267abef3273868f2d6b8c01409a5" upstream="master"/>
+  <project groups="pdk" name="platform/external/cros/system_api" path="external/cros/system_api" revision="32d297d055471c3bac3a89763e0cf0ef6483bff1" upstream="master"/>
+  <project groups="pdk" name="platform/external/curl" path="external/curl" revision="f0f7cd5b375b317e7eef65b6573902c04ee80ecc" upstream="master"/>
+  <project groups="pdk" name="platform/external/dagger2" path="external/dagger2" revision="41a53344ccbb242099a57ded9d1337430c1b5f8c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" revision="f5e7ab6b79b2b0ec1b87d5f28997c44223e46766" upstream="master"/>
+  <project groups="pdk" name="platform/external/desugar" path="external/desugar" revision="ee13d6b51a19ff1dccbd9015420e07f544169f8c" upstream="master"/>
+  <project groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" revision="9e6367a9399bb671b1b474bf21898d2ca68b6357" upstream="master"/>
+  <project groups="pdk" name="platform/external/dhcpcd-6.8.2" path="external/dhcpcd-6.8.2" revision="df64c96f01b3dd2a823d6aa788653c3bedd1efda" upstream="master"/>
+  <project groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" revision="6661f3ca66b55d8f5a57b96fec97efaf8f3897a5" upstream="master"/>
+  <project groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" revision="4cafaba2321b7b74f81c621aa01112156258adb3" upstream="master"/>
+  <project groups="pdk" name="platform/external/dnsmasq" path="external/dnsmasq" revision="00d11a4477637375322692d0c5603c60d38c6f1a" upstream="master"/>
+  <project groups="pdk" name="platform/external/doclava" path="external/doclava" revision="f381ec7f6fca0618fb01231a758402597b1239e3" upstream="master"/>
+  <project groups="pdk" name="platform/external/donuts" path="external/donuts" revision="005389fb31a67841b5de42f0d25fbfab843e208c" upstream="master"/>
+  <project groups="drm_gralloc,pdk-fs" name="platform/external/drm_gralloc" path="external/drm_gralloc" revision="e19443ea00d3b27622590b920819e53da68f7fda" upstream="master"/>
+  <project groups="drm_hwcomposer,pdk-fs" name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer" revision="578059aa61b0a7e0a56e10d849bc978783a473d6" upstream="master"/>
+  <project groups="pdk" name="platform/external/droiddriver" path="external/droiddriver" revision="059f2d82efbcc733574b2b90dbf999280c04c4f1" upstream="master"/>
+  <project groups="pdk" name="platform/external/drrickorang" path="external/drrickorang" revision="8ea137d1086e621188f70ffac34a6ba8924af2c6" upstream="master"/>
+  <project name="platform/external/dtc" path="external/dtc" revision="b1d8b2cd5e57a5c97bdd011624c06c40052b821e" upstream="master"/>
+  <project groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="7975672f634b603c4b4ff614e046c4e18b4561c6" upstream="master"/>
+  <project groups="pdk" name="platform/external/easymock" path="external/easymock" revision="8bc2748f2850c88ab6b86c6ceed1ce65bed5ee16" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/eclipse-basebuilder" path="external/eclipse-basebuilder" revision="076f46888ed346775b8efc564d7694063ef5eea7" upstream="master"/>
+  <project groups="pdk" name="platform/external/eclipse-windowbuilder" path="external/eclipse-windowbuilder" revision="c533332008088ee5f61745b724361fbde5b7e770" upstream="master"/>
+  <project groups="pdk" name="platform/external/eigen" path="external/eigen" revision="cfefb1dc11c33fb8a74291cf2b08e3aa49cb879a" upstream="master"/>
+  <project groups="pdk" name="platform/external/elfutils" path="external/elfutils" revision="2ed2550b8595fde721dbc6a12091609a598192af" upstream="master"/>
+  <project groups="pdk" name="platform/external/emma" path="external/emma" revision="deb5711b2635ee9d332605e2e00b63b32bed6777" upstream="master"/>
+  <project groups="pdk" name="platform/external/esd" path="external/esd" revision="943c42b6f8e9afe821744aa4c039f4943ebf29f5" upstream="master"/>
+  <project groups="pdk" name="platform/external/expat" path="external/expat" revision="8954a5667c2941642b9f63bec3a0482a8e9eeab3" upstream="master"/>
+  <project groups="pdk" name="platform/external/eyes-free" path="external/eyes-free" revision="16bd4c7a4d1bfe229068b637614dad7c48dd2ceb" upstream="master"/>
+  <project groups="pdk" name="platform/external/f2fs-tools" path="external/f2fs-tools" revision="85b4766bedbbe8b2dfdc23b401194c9dd3c60dd0" upstream="master"/>
+  <project groups="pdk" name="platform/external/fdlibm" path="external/fdlibm" revision="fcd17254a9e59ceb0420d4a2faf29db6b004c443" upstream="master"/>
+  <project groups="pdk" name="platform/external/fec" path="external/fec" revision="b3e9d18f59759ff5407be13ef8c6d2e2a497305e" upstream="master"/>
+  <project groups="pdk" name="platform/external/fio" path="external/fio" revision="138dfa04ca2e19c0f03b4d0b591ca2d5e3bad3df" upstream="master"/>
+  <project groups="pdk" name="platform/external/flac" path="external/flac" revision="9654326e6af758bf25e50f15a7e7b9cff6755a78" upstream="master"/>
+  <project groups="pdk" name="platform/external/fmtlib" path="external/fmtlib" revision="1ce26af6d14810a277a5f62a5619a372b93183cc" upstream="master"/>
+  <project groups="pdk" name="platform/external/fonttools" path="external/fonttools" revision="fede58680958e96e6e8f61c3cc6282f798452c53" upstream="master"/>
+  <project groups="pdk" name="platform/external/freetype" path="external/freetype" revision="613f720f08f579806a05f0e45927f4f9ff147885" upstream="master"/>
+  <project groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="9d1e7e4558c8b53731ba1d06d33b5516934d1ff7" upstream="master"/>
+  <project groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" revision="b76ecb153a784e70e07bf7e19bcf3dfd6caec815" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/giflib" path="external/giflib" revision="a6e0183cdd9f69b180b4adbd613e66772d9bc633" upstream="master"/>
+  <project groups="pdk" name="platform/external/glide" path="external/glide" revision="31e64acd1e65045471124267a06241eff1f55d26" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" revision="983f59ce9add3687c81e2ea5f61027c4c9d6a3b9" upstream="master"/>
+  <project groups="dragon,pdk-fs" name="platform/external/google-breakpad" path="external/google-breakpad" revision="31bf6fed97629fd3420cda58a97469ec7e5389f0" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/carrois-gothic-sc" path="external/google-fonts/carrois-gothic-sc" revision="0062a10458d4c357f3082d66bcb129d11913aaae" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/coming-soon" path="external/google-fonts/coming-soon" revision="2c5cb418c690815545bbb0316eae5fd33b9fc859" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/cutive-mono" path="external/google-fonts/cutive-mono" revision="bce2136662854076023066602526ba299e6556b2" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/dancing-script" path="external/google-fonts/dancing-script" revision="7b6623bd54cee3e48ae8a4f477f616366643cc78" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-tv-pairing-protocol" path="external/google-tv-pairing-protocol" revision="84cad11e5d8c3000472e8bb22dc698cf9b3c8612" upstream="master"/>
+  <project groups="pdk" name="platform/external/googletest" path="external/googletest" revision="ff9b10309a390a7d631edc7808e129237972245b" upstream="master"/>
+  <project groups="pdk" name="platform/external/gptfdisk" path="external/gptfdisk" revision="165c596ac3c69ecbc5a424ad9c1f1be6d44d0bb3" upstream="master"/>
+  <project groups="pdk" name="platform/external/guava" path="external/guava" revision="5000b35f73a42ddb5554aa4c1c5ffea9c999741d" upstream="master"/>
+  <project groups="pdk" name="platform/external/guice" path="external/guice" revision="411312e790280e72c08e018134d7e3a0e7ebab76" upstream="master"/>
+  <project groups="pdk" name="platform/external/hamcrest" path="external/hamcrest" revision="0d446c0a6f5ab27bf24d8e046f1d03ce40f09594" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" revision="6dd5ce2e32bc4a474b6ae7f0c3b6059a995ea5a7" upstream="master"/>
+  <project groups="pdk" name="platform/external/hyphenation-patterns" path="external/hyphenation-patterns" revision="dedeff64279b77bafff72b6d866efc93e829b4ab" upstream="master"/>
+  <project groups="pdk" name="platform/external/icu" path="external/icu" revision="f7d5c16a1e76d13dff10f99f64f8b19425401651" upstream="master"/>
+  <project groups="pdk" name="platform/external/ims" path="external/ims" revision="711f9d55979cfe28b19a502cbe13a4d7e7e674f0" upstream="master"/>
+  <project groups="pdk" name="platform/external/iproute2" path="external/iproute2" revision="1b32ccb0313537bd0bebcb6ec3c0398e90aa103a" upstream="master"/>
+  <project groups="pdk" name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="afbdf60e1d4cafe0f894fe8e8e5bfa49e47c80b2" upstream="master"/>
+  <project groups="pdk" name="platform/external/iptables" path="external/iptables" revision="9eeff146a05de990eb2199092b5259184e7cab4b" upstream="master"/>
+  <project groups="pdk" name="platform/external/iputils" path="external/iputils" revision="940e24bb44d68ec7d600ef6d07e458a448d4c6fb" upstream="master"/>
+  <project groups="pdk" name="platform/external/iw" path="external/iw" revision="6a3e9a164c98577c28c0c9b1b9a0fbe7d7436e47" upstream="master"/>
+  <project groups="pdk" name="platform/external/jacoco" path="external/jacoco" revision="b1b164ac860eddaed3abfb819df73bfcccdaa327" upstream="master"/>
+  <project groups="pdk" name="platform/external/jarjar" path="external/jarjar" revision="7adc960353812730b4fb15a72901056cf3b3c516" upstream="master"/>
+  <project groups="pdk" name="platform/external/javasqlite" path="external/javasqlite" revision="ee41d81872eedc632f42bd231b95bc945690d159" upstream="master"/>
+  <project groups="pdk" name="platform/external/javassist" path="external/javassist" revision="f7c4b954072e563b75f6910c25bb689bbf38a3d1" upstream="master"/>
+  <project groups="pdk" name="platform/external/jcommander" path="external/jcommander" revision="68545397d8332a61f800ce9617715a22445ed9a9" upstream="master"/>
+  <project groups="pdk" name="platform/external/jdiff" path="external/jdiff" revision="62f4ca1f64eaeb0896416949d6120b912ac67d3b" upstream="master"/>
+  <project groups="pdk" name="platform/external/jemalloc" path="external/jemalloc" revision="a6f685beacaa3f8da06cb28f38bb559eac7d4dda" upstream="master"/>
+  <project groups="pdk" name="platform/external/jetty" path="external/jetty" revision="3077b6f9426ccafb6bd5c00a748e1d40af9e1ae5" upstream="master"/>
+  <project groups="tradefed,pdk-fs" name="platform/external/jline" path="external/jline" revision="74812032f8d8eddbef387f18c96de9e5c38b8fdb" upstream="master"/>
+  <project groups="pdk" name="platform/external/jmdns" path="external/jmdns" revision="0c71647deb7f7835c473fd3dfb45943083e47794" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsilver" path="external/jsilver" revision="b9b84920ba47ddf7f15baa01c56b28e3d3f951ea" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsmn" path="external/jsmn" revision="45f59951efef6cd2924738c39a5f52d61e06eb79" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsoncpp" path="external/jsoncpp" revision="ecd640d0acf7c93c5dbfc37702e4eedbc18aa850" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsr305" path="external/jsr305" revision="333c5e0ea34930a10785f53e74dbe997d93ad2d8" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsr330" path="external/jsr330" revision="de30ee496a13d0f71d8ddaee1e247c3e8e43e58d" upstream="master"/>
+  <project groups="pdk" name="platform/external/junit" path="external/junit" revision="2faf8f4ae953dd2e847536c2712bbc563e34949a" upstream="master"/>
+  <project groups="pdk" name="platform/external/junit-params" path="external/junit-params" revision="b03560c32573b9057dc1daaf877501dbb4e16f8d" upstream="master"/>
+  <project groups="pdk" name="platform/external/kernel-headers" path="external/kernel-headers" revision="134f6bdcbfc9aae59db447822413388b49537864" upstream="master"/>
+  <project groups="pdk" name="platform/external/kmod" path="external/kmod" revision="087bd70f9a816bc37d77ef71c0b8f4253e60169e" upstream="master"/>
+  <project groups="pdk" name="platform/external/ksoap2" path="external/ksoap2" revision="3f3695df2e974811a5759d43f3532dcd9d6be26c" upstream="master"/>
+  <project groups="pdk" name="platform/external/libavc" path="external/libavc" revision="f4a17ae216f420f5d46e8680d4aa9317e6a9a4d8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libbackup" path="external/libbackup" revision="a645153b0a97663636bacdc5527c0d304fa79657" upstream="master"/>
+  <project groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" revision="9471399027d4a8e0ef5e1a68429b2e9e93a31e96" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcap" path="external/libcap" revision="64dcb22b223e3aae866d44ff35dc3acc2a9c58e8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcap-ng" path="external/libcap-ng" revision="835f318b9785a70415980fba96c34ee5c6b7e415" upstream="master"/>
+  <project groups="pdk" name="platform/external/libchrome" path="external/libchrome" revision="f320c0cf71af274e34404746d4303e6a2452e2d6" upstream="master"/>
+  <project groups="pdk" name="platform/external/libconstrainedcrypto" path="external/libconstrainedcrypto" revision="e1a8625038e715f0b14fd5466c02f0142673b1ec" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/libcups" path="external/libcups" revision="2447373f182dbfeb47fb86c0f5a6ac5773c65ac2" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcxx" path="external/libcxx" revision="0aea6aeca494754446dd1e5fe638fe68da128036" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcxxabi" path="external/libcxxabi" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="master"/>
+  <project groups="pdk" name="platform/external/libdaemon" path="external/libdaemon" revision="e2f604066d97431c95856c73d7b9ee46b348d37e" upstream="master"/>
+  <project groups="pdk" name="platform/external/libdivsufsort" path="external/libdivsufsort" revision="90d90b27c0b82cac20deabac79e97e274856eaf8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libdrm" path="external/libdrm" revision="791d9b9fd9bd768bc81f5f224fb5fc2904035fa5" upstream="master"/>
+  <project groups="pdk" name="platform/external/libedit" path="external/libedit" revision="67e14dfc833aafa400a3aad8cb329cbaec503445" upstream="master"/>
+  <project groups="pdk" name="platform/external/libese" path="external/libese" revision="5ab3613225e1e73ae9d04b7e1555c124752ccbf8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libevent" path="external/libevent" revision="596447c7ff2881a67e7082c905112584c3e61a17" upstream="master"/>
+  <project groups="pdk" name="platform/external/libexif" path="external/libexif" revision="2431bfa79df74fbb6e30b77ab9f3d89c300d18ae" upstream="master"/>
+  <project groups="pdk" name="platform/external/libgdx" path="external/libgdx" revision="5f9bb1dadc7e51a5fdb7171280366f8b3ec86eb8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libgsm" path="external/libgsm" revision="4a3459a3528b7f11cf09acfa2d2a1fb5142c1c2b" upstream="master"/>
+  <project groups="pdk" name="platform/external/libhevc" path="external/libhevc" revision="5d3d1a0a65949b09035cc366429f7f85215c2731" upstream="master"/>
+  <project groups="pdk" name="platform/external/libjpeg-turbo" path="external/libjpeg-turbo" revision="b8a887c09706633ac22ad6d13c9464b2ee539e77" upstream="master"/>
+  <project groups="pdk" name="platform/external/libldac" path="external/libldac" revision="94b3caf1fecd5261e6929469924b1e25aaeca0ff" upstream="master"/>
+  <project groups="pdk" name="platform/external/liblzf" path="external/liblzf" revision="a88b9629447deabe8697d2f8fd4cc70aa6e1b563" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmicrohttpd" path="external/libmicrohttpd" revision="1e68f5d827a859ba3b7ab6a70a60247e0b96afa5" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmojo" path="external/libmojo" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmpeg2" path="external/libmpeg2" revision="a0f640e21e42f5905d760ec3df1dc5203d0d209b" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmtp" path="external/libmtp" revision="7ed2065db3ab9851f47426f3a35ba7045ce528b2" upstream="master"/>
+  <project name="platform/external/libnetfilter_conntrack" path="external/libnetfilter_conntrack" revision="436dd293ff5503828a1fa33d725a1db87e4e03ed" upstream="master"/>
+  <project name="platform/external/libnfnetlink" path="external/libnfnetlink" revision="6cd19f65ff99f6deb836937c38fb9eedc113c101" upstream="master"/>
+  <project groups="pdk" name="platform/external/libnl" path="external/libnl" revision="defabfc078080d60369d901d3c7662f05605cb29" upstream="master"/>
+  <project groups="pdk" name="platform/external/libogg" path="external/libogg" revision="6a48629b7c7fc90326b2f959789828007b3cc184" upstream="master"/>
+  <project groups="pdk" name="platform/external/libopus" path="external/libopus" revision="a7703b70699299f078a189e19b6915120cded732" upstream="master"/>
+  <project groups="pdk" name="platform/external/libpcap" path="external/libpcap" revision="50a06a07f1dd408adf7607b76eaf02d0c254fe22" upstream="master"/>
+  <project groups="pdk" name="platform/external/libphonenumber" path="external/libphonenumber" revision="9313c2ce2fb61213e66adcf8ab4893a5d9c48da1" upstream="master"/>
+  <project groups="pdk" name="platform/external/libpng" path="external/libpng" revision="352e6a8ec05db372ccdfc80cb77de807d23e8432" upstream="master"/>
+  <project groups="pdk" name="platform/external/libunwind" path="external/libunwind" revision="76a0b9f6a9813311ddfd59aaa580339f36a2c510" upstream="master"/>
+  <project groups="pdk" name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="master"/>
+  <project groups="pdk" name="platform/external/libusb" path="external/libusb" revision="b81e632687e2380716ced43d28f7c95987959944" upstream="master"/>
+  <project groups="pdk" name="platform/external/libusb-compat" path="external/libusb-compat" revision="759481ae400d02fe99488dcdcd653b4f8139a39c" upstream="master"/>
+  <project groups="pdk" name="platform/external/libutf" path="external/libutf" revision="853ef375ba2ce430f5b13b556812b2d83ccc82e1" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvncserver" path="external/libvncserver" revision="d099c925eed901cedcb5f1b9079af45a3ca0e6b8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvorbis" path="external/libvorbis" revision="dee2e0a12822ec62c89c2d7582f1a7d32cd0875b" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvpx" path="external/libvpx" revision="8585b768902331df85f7d1bbbc11bee4715da97a" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvterm" path="external/libvterm" revision="f6cc826fe2eb9fc76fdf922d02ad86aecc5f1b18" upstream="master"/>
+  <project groups="pdk,libxml2" name="platform/external/libxml2" path="external/libxml2" revision="2975f91c5afcdc7c150e2db37430d958817270d0" upstream="master"/>
+  <project groups="pdk,libyuv" name="platform/external/libyuv" path="external/libyuv" revision="7a6bee2e5623dcc471f49a283144fed44dfb3757" upstream="master"/>
+  <project groups="vts,pdk" name="platform/external/linux-kselftest" path="external/linux-kselftest" revision="c33d1f8c4b98fa6aa24c67d484d31b58c0651933" upstream="master"/>
+  <project groups="pdk" name="platform/external/littlemock" path="external/littlemock" revision="105f5b4352a348a3628b081f4906f5dbb8c120f6" upstream="master"/>
+  <project groups="pdk" name="platform/external/lld" path="external/lld" revision="26c9bb3b51a7ac4bc45f73d532a03cfd9982043a" upstream="master"/>
+  <project groups="pdk" name="platform/external/llvm" path="external/llvm" revision="8cdd9f59ffb6bae793e50c7cfdb23e9eac0703c7" upstream="master"/>
+  <project groups="vts,pdk" name="platform/external/ltp" path="external/ltp" revision="5eca7e63c48f85c59486da4abd803b7ac9aed4b7" upstream="master"/>
+  <project groups="pdk" name="platform/external/lz4" path="external/lz4" revision="de7f627c7958b9847e0d9e6e29fcb566e3bb1dde" upstream="master"/>
+  <project groups="pdk" name="platform/external/lzma" path="external/lzma" revision="39a0299cfdac41a2631cfdb4bbb637ffa66170fd" upstream="master"/>
+  <project groups="pdk" name="platform/external/markdown" path="external/markdown" revision="06a8f8b914d477183f68b84424bce8ff4dae7e84" upstream="master"/>
+  <project groups="pdk" name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="e8c578035302f59c4e09f7170e18302261bc9e63" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/mesa3d" path="external/mesa3d" revision="e855ba79dee7a2d4df11d72752e1079cd5e58f2e" upstream="master"/>
+  <project groups="pdk" name="platform/external/messageformat" path="external/messageformat" revision="9e1e4dddc8aa0cae8279281488f8a6bf4f453192" upstream="master"/>
+  <project groups="pdk" name="platform/external/minijail" path="external/minijail" revision="fe5fb8ea506c1a198d690e712d848d149a0addd0" upstream="master"/>
+  <project groups="pdk" name="platform/external/mksh" path="external/mksh" revision="bba8f4a328807772fc16027133a9d63e9185fab5" upstream="master"/>
+  <project groups="pdk" name="platform/external/mmc-utils" path="external/mmc-utils" revision="6de31b2b8a09108f9b91bc12bee2b792f783dc62" upstream="master"/>
+  <project groups="pdk" name="platform/external/mockftpserver" path="external/mockftpserver" revision="777eb7d351810721b2416c4e48fe08e4ce0476f7" upstream="master"/>
+  <project groups="pdk" name="platform/external/mockito" path="external/mockito" revision="0211c64d5545015d76acda90d6013df67ec9124a" upstream="master"/>
+  <project groups="pdk" name="platform/external/mockwebserver" path="external/mockwebserver" revision="d680f43b995aae01123ee6bc7adb690dafcc47fe" upstream="master"/>
+  <project groups="pdk" name="platform/external/modp_b64" path="external/modp_b64" revision="68d0b5790fff5243aab59ae8108d7e69506ac4c4" upstream="master"/>
+  <project groups="pdk" name="platform/external/mp4parser" path="external/mp4parser" revision="88bd0c6cfa7fcfbbebcc15c2c565f714cb36b065" upstream="master"/>
+  <project groups="pdk" name="platform/external/mtpd" path="external/mtpd" revision="dfc7f34c62ee40f5ce47e0942021f96f62f937f7" upstream="master"/>
+  <project groups="pdk" name="platform/external/nanohttpd" path="external/nanohttpd" revision="c6783c32331b3fe78ffd5077e7f180995d0e268e" upstream="master"/>
+  <project groups="pdk" name="platform/external/nanopb-c" path="external/nanopb-c" revision="4b114fa241df177ec7fc36132d3bec20726c4f5f" upstream="master"/>
+  <project groups="pdk" name="platform/external/naver-fonts" path="external/naver-fonts" revision="91e6e9f94d1d769a8f742649674149ba98ce7d45" upstream="master"/>
+  <project groups="pdk" name="platform/external/netcat" path="external/netcat" revision="b023a43765b15f0b0fd5b52b7d8021f515c59c23" upstream="master"/>
+  <project groups="pdk" name="platform/external/netperf" path="external/netperf" revision="e100a0c4105b94f7044b243287a5da22f5e8e4e7" upstream="master"/>
+  <project groups="pdk" name="platform/external/neven" path="external/neven" revision="95e6c4663c640c67a69e1d2b44696753282136f8" upstream="master"/>
+  <project groups="pdk" name="platform/external/nfacct" path="external/nfacct" revision="3872c41d0bfb0dbe6c37ea5db5cc1e1d7a0d7971" upstream="master"/>
+  <project groups="pdk" name="platform/external/nist-pkits" path="external/nist-pkits" revision="e79665e3657171f55a979ca558ebe3c3dbf108d2" upstream="master"/>
+  <project groups="pdk" name="platform/external/nist-sip" path="external/nist-sip" revision="8445067c3b53e5bd56c32f1c4fb688083c4f4005" upstream="master"/>
+  <project groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" revision="60e126f1c096b20d4a3685e1de1147b6595e9012" upstream="master"/>
+  <project groups="pdk" name="platform/external/oauth" path="external/oauth" revision="49f3624a6d3307b640a012f15b94d04174473501" upstream="master"/>
+  <project groups="pdk" name="platform/external/objenesis" path="external/objenesis" revision="30c85e8178b11799cf08ad21339f52eaa787a13e" upstream="master"/>
+  <project groups="pdk" name="platform/external/okhttp" path="external/okhttp" revision="b53397b37a05fd50529810c726e7214cdc5b191e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/opencv" path="external/opencv" revision="6acb1f4a6e68f80b1cb0182f3d334dd8607697b5" upstream="master"/>
+  <project groups="pdk" name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer" revision="bbfb25464ff30c5a62dce351d719a8c533afb2a3" upstream="master"/>
+  <project groups="pdk" name="platform/external/parameter-framework" path="external/parameter-framework" revision="e210979b2eb1410f80fb88a9a4c235ee0cd23d0c" upstream="master"/>
+  <project groups="pdk" name="platform/external/pcre" path="external/pcre" revision="97f96c13a5b0c22e9827279eb0dd38e9c889f244" upstream="master"/>
+  <project groups="pdk" name="platform/external/pdfium" path="external/pdfium" revision="e4e9d1b6b387072f9071f896993a9cfe5481ab4c" upstream="master"/>
+  <project groups="pdk" name="platform/external/piex" path="external/piex" revision="ac5a3090cb5b5c2aaa7e1c68c9a68fc4f5a38c26" upstream="master"/>
+  <project groups="pdk" name="platform/external/ppp" path="external/ppp" revision="7e60466a0009f58aa09b60bf6dbb96cacd6cb829" upstream="master"/>
+  <project groups="pdk" name="platform/external/proguard" path="external/proguard" revision="af893cdc1242e4cfbeeb10e2323f9a689a825177" upstream="master"/>
+  <project groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f" upstream="master"/>
+  <project groups="pdk" name="platform/external/python/cpython2" path="external/python/cpython2" revision="181a615a16fd15caa50a2e6f729456e2c9d42e42" upstream="master"/>
+  <project groups="pdk" name="platform/external/python/cpython3" path="external/python/cpython3" revision="9458f8e38d4fe0d58890c5867485dbbf2d538955" upstream="master"/>
+  <project groups="pdk" name="platform/external/r8" path="external/r8" revision="730c831ebd6752bbe7c205a84b3f5e721ea2e443" upstream="master"/>
+  <project groups="pdk" name="platform/external/regex-re2" path="external/regex-re2" revision="79cce43a82abc1bc56c65de07a7df47d54e163a9" upstream="master"/>
+  <project groups="pdk" name="platform/external/replicaisland" path="external/replicaisland" revision="23e53aa67dc788cd2fe0598eaf7c9f20eb93c392" upstream="master"/>
+  <project groups="pdk" name="platform/external/rmi4utils" path="external/rmi4utils" revision="40eb2d785d3e367c01fc2a3d53820550e7f66739" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric" path="external/robolectric" revision="797e01c269d344b03f6080d46926c91603465949" upstream="master"/>
+  <project groups="pdk" name="platform/external/roboto-fonts" path="external/roboto-fonts" revision="25fa2dde3aacaeacb2797bcffddce96014f4fcc3" upstream="master"/>
+  <project groups="pdk" name="platform/external/rootdev" path="external/rootdev" revision="1dd6771e0f2e7da8736c9b21603817bce0d55ea9" upstream="master"/>
+  <project groups="pdk" name="platform/external/safe-iop" path="external/safe-iop" revision="cd76f998688d145235de78ecd5b340d0eac9239d" upstream="master"/>
+  <project groups="pdk" name="platform/external/scrypt" path="external/scrypt" revision="b7477d8eedb4aaf9ad5af921ea43bfe17103a23a" upstream="master"/>
+  <project name="platform/external/seccomp-tests" path="external/seccomp-tests" revision="e602290af558cee366ec98e366e0e8460c39534e" upstream="master"/>
+  <project groups="pdk" name="platform/external/selinux" path="external/selinux" revision="d72d78d96990b546bbf0b4a64c3b7320a54eabb9" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/sfntly" path="external/sfntly" revision="a217f56dac15a71326445fa7f6a789ec00b22392" upstream="master"/>
+  <project groups="pdk" name="platform/external/shflags" path="external/shflags" revision="c4876e01829b8cf110ee33267bb1bad1f8ebb51d" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/skia" path="external/skia" revision="740dcbc14f4bb497082890c1c4a85c0a993120a9" upstream="master"/>
+  <project groups="pdk" name="platform/external/sl4a" path="external/sl4a" revision="e83595a366433378e398273d5e25eba3817794eb" upstream="master"/>
+  <project groups="pdk" name="platform/external/slf4j" path="external/slf4j" revision="b4eb5f69f088f53ede0b7ee4a1a3bf2c3ff58418" upstream="master"/>
+  <project groups="pdk" name="platform/external/smali" path="external/smali" revision="78cf98bb8c439f99f06f7b609c5c533a9d41de68" upstream="master"/>
+  <project groups="pdk" name="platform/external/snakeyaml" path="external/snakeyaml" revision="03d1dd1553534e717fdff5f7bed00b67dbb23431" upstream="master"/>
+  <project groups="pdk" name="platform/external/sonic" path="external/sonic" revision="1163465de6c4b6c1816de74db60b28769cf5ac96" upstream="master"/>
+  <project groups="pdk" name="platform/external/sonivox" path="external/sonivox" revision="95ad2973de15846e1f67c5c5c30eae877afb2ca4" upstream="master"/>
+  <project groups="pdk" name="platform/external/speex" path="external/speex" revision="a7d909edd14636c8934e1b61cce563ef9d29c477" upstream="master"/>
+  <project name="platform/external/spirv-llvm" path="external/spirv-llvm" revision="9ebe91915ecc1ca31c074c92e4f11b7625801f18" upstream="master"/>
+  <project groups="pdk" name="platform/external/sqlite" path="external/sqlite" revision="39a32b46137c57b816e71d73438e4fac69b6b9d6" upstream="master"/>
+  <project groups="pdk" name="platform/external/squashfs-tools" path="external/squashfs-tools" revision="393e365802711fb6969858f79d80104399d140c0" upstream="master"/>
+  <project groups="pdk" name="platform/external/strace" path="external/strace" revision="5168b2b17e16c0ce1e5572080c46cb6ad4a2fecd" upstream="master"/>
+  <project groups="pdk" name="platform/external/svox" path="external/svox" revision="3279a68c2735ac1e1265ab2ecf5ee9c9afa076b3" upstream="master"/>
+  <project groups="pdk" name="platform/external/tagsoup" path="external/tagsoup" revision="9c02d9f506855965ec513685788890dfc856a5bc" upstream="master"/>
+  <project groups="pdk" name="platform/external/tcpdump" path="external/tcpdump" revision="1aa1e7ffca235f716b36c0a4588f84e23ea1be38" upstream="master"/>
+  <project groups="pdk" name="platform/external/testng" path="external/testng" revision="8f2e8231852f454b5903cf886be55e9f647cdd76" upstream="master"/>
+  <project groups="pdk" name="platform/external/timezonepicker-support" path="external/timezonepicker-support" revision="99e91a76fd74bad10266623d67cdb98d011f709e" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinyalsa" path="external/tinyalsa" revision="7c703a6b307ae7c3ba69429ed0c71417e507faff" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinycompress" path="external/tinycompress" revision="3d60feed720ce0ecf66196ca4846a55b3e6ee3c2" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinyxml" path="external/tinyxml" revision="ccc219c40a820afd30ad347c0e3d2bdbdf1df109" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinyxml2" path="external/tinyxml2" revision="cf2bc196dcdac02efb415c4305180986411d73d0" upstream="master"/>
+  <project name="platform/external/toolchain-utils" path="external/toolchain-utils" revision="7091edfaa0ec531905b7d914e9307cd74caf02ea" upstream="master"/>
+  <project groups="pdk" name="platform/external/toybox" path="external/toybox" revision="3829236617fca43f854035a0608d16562a947e16" upstream="master"/>
+  <project groups="pdk" name="platform/external/tpm2" path="external/tpm2" revision="00f7bc755f76f483f6a59f917727339e089a9cc4" upstream="master"/>
+  <project groups="pdk" name="platform/external/tremolo" path="external/tremolo" revision="75c45ed3b5a684fb5bd3f09d64cd242adcda0752" upstream="master"/>
+  <project groups="pdk" name="platform/external/unicode" path="external/unicode" revision="680f240bda39c798480bef3bb36c671af1f575c1" upstream="master"/>
+  <project name="platform/external/universal-tween-engine" path="external/universal-tween-engine" revision="5a8be7ee6337367a1dcf11bdad865e7917519e46" upstream="master"/>
+  <project groups="pdk" name="platform/external/v8" path="external/v8" revision="7bde41a362a5746e44e9efc2ae8d1843f39d875e" upstream="master"/>
+  <project groups="pdk" name="platform/external/valgrind" path="external/valgrind" revision="84dd75ab14160e18d95f2f3ea6120c03ce8c429c" upstream="master"/>
+  <project groups="vboot,pdk-fs" name="platform/external/vboot_reference" path="external/vboot_reference" revision="0ad090ffa37b9a1e9a0063a4d4b808c6fe4809e2" upstream="master"/>
+  <project groups="pdk" name="platform/external/vixl" path="external/vixl" revision="2da09a48dc4d5a3c585f897f256c2c6c5fa4eb5a" upstream="master"/>
+  <project groups="pdk" name="platform/external/vogar" path="external/vogar" revision="7fa0640bfb29ae9593f2e07516f4a2925fd0c54a" upstream="master"/>
+  <project groups="pdk" name="platform/external/volley" path="external/volley" revision="3a1232594eb627e9e59b22406816648a55a3f2ae" upstream="master"/>
+  <project groups="pdk" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="4c40acb97e6df4a5895877f81cde4e9c0704a95f" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/webp" path="external/webp" revision="e99d2e88295130a1874890b3b118969917de5a84" upstream="master"/>
+  <project groups="pdk" name="platform/external/webrtc" path="external/webrtc" revision="c07e6f5974151842a7a37a66aa7592761547287e" upstream="master"/>
+  <project groups="pdk" name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="14c5ecd85f3fd6a703a8bef710690246c8dd42bb" upstream="master"/>
+  <project groups="pdk" name="platform/external/wycheproof" path="external/wycheproof" revision="1187a7bf7b612a8c09b70e65ea52351a1c5c731b" upstream="master"/>
+  <project groups="pdk" name="platform/external/xmlrpcpp" path="external/xmlrpcpp" revision="1d7192fe0d2f788f8f150899c58b86c5ff10456a" upstream="master"/>
+  <project groups="pdk" name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5" upstream="master"/>
+  <project groups="pdk" name="platform/external/xmp_toolkit" path="external/xmp_toolkit" revision="42ea4dc6d1fc2206a7778029070ed9213e3b0fbf" upstream="master"/>
+  <project groups="pdk" name="platform/external/xz-embedded" path="external/xz-embedded" revision="03e7a3eae664d9ee1862b5f152310d17ae5c7428" upstream="master"/>
+  <project groups="pdk" name="platform/external/zlib" path="external/zlib" revision="30595680d975bf98dd62e3c25d16562ab33c3d4d" upstream="master"/>
+  <project groups="pdk" name="platform/external/zopfli" path="external/zopfli" revision="b36f966df9e7767a6b0aeb00fea29af0c57c89be" upstream="master"/>
+  <project groups="pdk" name="platform/external/zxing" path="external/zxing" revision="fedf8f2d8099bf7bb85dc3db8699343d56617deb" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/av" path="frameworks/av" revision="66688d8836830d742dd52dffabbf6c26bd16ad94" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" revision="b975c88178775cfacd2b9685f6286605c009cec7" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" revision="5950103a67264d36e0c5c65330604916e462714d" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" revision="829ab4b9b5a97eccc3f7662f8211e608a5db6ec0" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/compile/slang" path="frameworks/compile/slang" revision="46d3d78036e83b1c83504412afa212ed242feb13" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/data-binding" path="frameworks/data-binding" revision="15281a01df0a5892d818080f1df669bdb8a319f7" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ex" path="frameworks/ex" revision="d2ea93572bd276e4b5b9bd86887603a35f9a0f5b" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" revision="b9d30cfae90bd5584a8e7926ec6d938ce323e0fd" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/minikin" path="frameworks/minikin" revision="ec682a375dc8f39cd7c7dc91d65aec09d0ef4edb" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ml" path="frameworks/ml" revision="3d53a93c79beb608ca52f7e1ffbf2fc7d9c3722f" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/multidex" path="frameworks/multidex" revision="6450225f3eaf865b0838e84c4656f6dd6048d87b" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/native" path="frameworks/native" revision="2bb661ca09d87de9a47bd06145c42dfe99d51ca7" upstream="master"/>
+  <project groups="pdk-fs" name="platform/frameworks/opt/bitmap" path="frameworks/opt/bitmap" revision="a0d4e3108663202564a6833b76770075b8e5b767" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/bluetooth" path="frameworks/opt/bluetooth" revision="991e0444ed6edb1a77b0feae73c14e2a886cbf0d" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/calendar" path="frameworks/opt/calendar" revision="886d7d1277b82347c30ec5d79ba1576680947bb8" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/chips" path="frameworks/opt/chips" revision="02ced36ad1e062e79397296ebd1dc760870a4e42" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker" revision="c1d5eb2d31fb6a74ed129722754139c759aedbe8" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/datetimepicker" path="frameworks/opt/datetimepicker" revision="5348c906911a9ae65b165023e9e4ce45eee05c02" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="92eede13edbf22b501edb9aeb92366f91eab9781" upstream="master"/>
+  <project groups="pdk-fs" name="platform/frameworks/opt/inputconnectioncommon" path="frameworks/opt/inputconnectioncommon" revision="3baece9b20fa480da46d860acd7320fd9eee3386" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon" revision="990fcb1a6dbb5d1204cc8ec86e4bc3f691f4aeeb" upstream="master"/>
+  <project groups="pdk-fs" name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet" revision="264bef96c82961029702fcf8e12b0fddfa0d09ab" upstream="master"/>
+  <project groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" revision="ff0979256d1a67a62c726d6fe15264c496990605" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" revision="2e09c0ba8a11ee629a85582413598c60cca09e8e" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" revision="a4a7244fea03df223af726b0e8a4028593bd8e4b" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/photoviewer" path="frameworks/opt/photoviewer" revision="c0793686e13dafc2f45b0ad3e079f707938c6534" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/setupwizard" path="frameworks/opt/setupwizard" revision="2cce48fde424bd078f024d5ddc7c564ca1161e2f" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="bfc44f2e2ac6cb8e8ba51e4250a10401714bf198" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" revision="e344fd847c154f2d0680bf1089390326d634d847" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" revision="15d297d8ac4664e4a491448d9c15158ee51714f9" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" revision="56bb39fe6274b099522cff372dcab9482fc35e60" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" revision="684e045dc0efca4d5a8f0ed4b28036444ff9385f" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/webview" path="frameworks/webview" revision="35975286092f329186f66cf346eb6b0dff3c2e61" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="7bfc4444b48f1f046d50fc799a3bc64fc8e3c7df" upstream="master"/>
+  <project name="platform/hardware/akm" path="hardware/akm" revision="7889f98849ad3913586904e00d91b32cc0ceb75b" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="1ed4bedf4af755edc61bccb8f468a0df008dcf1f" upstream="master"/>
+  <project groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="052255ec30cf33e27bb0406cd5b3f9998325d6e4" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" revision="b75c9f3714cfae3dad3d976958e063150781437e" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/audio_media" path="hardware/intel/audio_media" revision="218f0d6bc9532d0b707ea325fd96998249fe47bf" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/bootstub" path="hardware/intel/bootstub" revision="c759e5127aa582ac515ee1446da15f601b15a99a" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/bd_prov" path="hardware/intel/common/bd_prov" revision="8af329f2d2b54dfcfa84051d3ce1fae95f79011a" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libmix" path="hardware/intel/common/libmix" revision="a644e4f384a7bd2afa4460da3a9f7951e9fa205e" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libstagefrighthw" path="hardware/intel/common/libstagefrighthw" revision="9d15c1c031fdf9cd4fa153e76245d7a5f8b82ed8" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libva" path="hardware/intel/common/libva" revision="feff90bd79e7152d06f4275c30209af2826ae8ba" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libwsbm" path="hardware/intel/common/libwsbm" revision="ac747113d4f6739b1462ca7fb40f2091691e209b" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/omx-components" path="hardware/intel/common/omx-components" revision="3db8bb9d44eef64553a88fdc2698ef3b593c49c7" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/utils" path="hardware/intel/common/utils" revision="6b9b06d89fd0e01037d3138c71886f2c315ae9ee" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/wrs_omxil_core" path="hardware/intel/common/wrs_omxil_core" revision="760b9713c84566e6a3a39d114d346d20389f47a8" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/img/hwcomposer" path="hardware/intel/img/hwcomposer" revision="8c2ae7ccfd78fb4efaf4c0c61a697f2075584934" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/img/psb_headers" path="hardware/intel/img/psb_headers" revision="aed9716b5467e75728f761ac75a4ba5ca3c51ea0" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/img/psb_video" path="hardware/intel/img/psb_video" revision="7407927b0eda431b7d817cb9d78189f335f509b1" upstream="master"/>
+  <project groups="intel_sensors,pdk" name="platform/hardware/intel/sensors" path="hardware/intel/sensors" revision="68dc9e70b79dacddc4e0bf00af0de7f764b04eed" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" revision="1bbe51d0b5bef615692afe6ccc24259c1b2208e4" upstream="master"/>
+  <project groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" revision="11e5ff75af866f91622b6008fa13db1c3685ae69" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" revision="f12e85e1d3aa640922686d9c4cab992684812535" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="483a68f68a3f7f115f8909d663e93edaf89762f5" upstream="master"/>
+  <project groups="marvell_bt,pdk" name="platform/hardware/marvell/bt" path="hardware/marvell/bt" revision="3f33d194e8300816b94d1d7b68b1d48c8f903251" upstream="master"/>
+  <project groups="qcom,qcom_audio,pdk" name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="ba9bce36176b05695bd042acadc4a254ab911872" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/qcom/bootctrl" path="hardware/qcom/bootctrl" revision="6007fe6af3f7eb0c6b5fc3cab3c0f0cf5a7b50fe" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/bt" path="hardware/qcom/bt" revision="5e2825785169ae647e80ce48ac814abe2ca57532" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="383b6cb93b5952c2a87b3ea5ce2be50f006dd395" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/data/ipacfg-mgr" path="hardware/qcom/data/ipacfg-mgr" revision="cc379d116231083e1b804fea9b0ef52d9e105ae1" upstream="master"/>
+  <project groups="pdk,qcom,qcom_display" name="platform/hardware/qcom/display" path="hardware/qcom/display" revision="42ea1de6807fa5885f18cbd6c5fd96f80395fcea" upstream="master"/>
+  <project groups="qcom,qcom_gps,pdk" name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="45c0574442a01c2f6a9ccb2044b6f30c7ad288e4" upstream="master"/>
+  <project groups="qcom,qcom_keymaster,pdk" name="platform/hardware/qcom/keymaster" path="hardware/qcom/keymaster" revision="29565ce1f9219e66b7fb40063d49d14bb84ba606" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="63abe022daf627edac121f5c389d7f660db547ac" upstream="master"/>
+  <project groups="qcom_msm8960,pdk" name="platform/hardware/qcom/msm8960" path="hardware/qcom/msm8960" revision="c25a431842a26b5756b58a9d4a42c776e0457ba2" upstream="master"/>
+  <project groups="qcom_msm8994,pdk" name="platform/hardware/qcom/msm8994" path="hardware/qcom/msm8994" revision="60aaa00b2e0d537c0f51631dd88d919fc1baf439" upstream="master"/>
+  <project groups="qcom_msm8996" name="platform/hardware/qcom/msm8996" path="hardware/qcom/msm8996" revision="c552e34d90d0ff2b69660943c2060f17b5d59eb9" upstream="master"/>
+  <project groups="qcom_msm8x26,pdk" name="platform/hardware/qcom/msm8x26" path="hardware/qcom/msm8x26" revision="5c60d76743ed98e7082b7f72927c17a7b86e0218" upstream="master"/>
+  <project groups="qcom_msm8x27,pdk" name="platform/hardware/qcom/msm8x27" path="hardware/qcom/msm8x27" revision="8ff5c0057cbdecfa09410c1710ba043e191a2862" upstream="master"/>
+  <project groups="qcom_msm8x84,pdk" name="platform/hardware/qcom/msm8x84" path="hardware/qcom/msm8x84" revision="582b414269d8472d17eef65d8a8965aa8105042f" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/power" path="hardware/qcom/power" revision="3a098ee1f89c398b9d6e7b5dfae9c694994f8bc4" upstream="master"/>
+  <project groups="qcom_wlan,pdk" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="ec9deb6e65d7c7816083d925255bbaefe16e4778" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/ril" path="hardware/ril" revision="d5461a4f08750fbaa1be66d7db9068f6fa064953" upstream="master"/>
+  <project groups="pdk" name="platform/libcore" path="libcore" revision="702f599857e13697805ba8477437038f87a27206" upstream="master"/>
+  <project groups="pdk" name="platform/libnativehelper" path="libnativehelper" revision="d0865381b9f1989fc059bb8ae4c31519b56b1b5a" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" revision="0aa0611f9c6775575da56a1746fef1cf68267b0e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="4cafef3a64082be8f38bfa4e59ea619c5483acdf" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" revision="ffc5f72f39de7f9bc956ab29d087596d0f55ef70" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="e1bda28f1545111ba7734577f23e194bf3db3f5f" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="2bbf7b8414ebcff2207b08224d8913241a766a5a" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" revision="d396acf862f82209cd5d770a3f03fc95d3b7326b" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" revision="46d5820744888866cab227b38eaae21b6f93a39a" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="c52467b4e38ab74b233ea132b3212a9d17af0785" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="7562fee50a9db5afa94786f1d3acb1f0452e3ea7" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="41e553f6ec13e860694a2790cea82a4300b6703e" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/ContactsCommon" path="packages/apps/ContactsCommon" revision="c59284acd9283f2274fc18fe69ea9d08cf1245d4" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="b89bbe70df270c344123d7ce2bcecf1a84c399f1" upstream="master"/>
+  <project groups="pdk" name="platform/packages/apps/DevCamera" path="packages/apps/DevCamera" revision="85b25ee8ce0c5d19b53963c985869100282b55d1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Dialer" path="packages/apps/Dialer" revision="8e49b42b6fde177fb242da12bb05365ef03362e1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Email" path="packages/apps/Email" revision="1239cd59a0f4dfd0a96e1a83b8871bd2b18358c6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo" revision="b7282555b3b99fc9aa98b6c807662fa096c80e3c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/ExactCalculator" path="packages/apps/ExactCalculator" revision="7c359e389457d7cb7cd4f696608355beb3fa13f0" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ae5a3067f51cee6cfeec73d56815892bb3f6c4de" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" revision="5ffe93060777b92f221adbd0ddc67b9479852d80" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f19c4a10890cafb17ceaf68cda835dc24aad455c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" revision="64b7df195d2bfdcc41579e9ef5f3b49afde18116" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="44c1afdc7fe9f4420933ad0c9fd824931179ca27" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" revision="a80a70f2f8c5e32e7b1ec6c78c4f7c3b3500102e" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" revision="d166148abab4af9111e325a859f86d58e2a04c0b" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" revision="2a68a11b2c9156f9f9747fe0b974d0baca157706" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Messaging" path="packages/apps/Messaging" revision="7b2c6ed6a50b10b698f0b0251ac3a9b532432d72" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Music" path="packages/apps/Music" revision="75df705a0f4e7f36050ea68fa8695325f2a691d8" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" revision="035fa0123d87b48554cbd294ee9681b25eb7049b" upstream="master"/>
+  <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="7b94e08d3fbdcfe83ec108d581355b6b0b8c5978" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" revision="01e429c08e51291315890de9677151a7e0b6ad35" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="0d467d56ce68a1bc26d721a5c3b9a6caf98aadb4" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="79731f02b7009206a01182d2cca15dfc8491da09" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" revision="f962ad993640d79dc1d76494650cf6d3e83ee6de" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="d686dc74168ed5324b2388133531f30255659ae6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="077fc59dd26cdecdfe2ea3af614291b103faa7e2" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="b17f4ddf6719faef79535c76ea6af84f5009d4a1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/RetailDemo" path="packages/apps/RetailDemo" revision="66244a5c528afb29b1a88aa788770063b91c89b2" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" revision="1e01c3e1bcc0ed83b3676e1d5c0b75d5ed873391" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="31a2f413f86c9ad2b7150e5b379d408cac5e7645" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="5f67a8eaea9379d7fce53db77e9ed7b47e49f1e1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SpareParts" path="packages/apps/SpareParts" revision="4db997871e3f4c3f84660815096e5276b47c5c91" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="51cc8462c082a26810f5d7c5a2648232a77e795c" upstream="master"/>
+  <project groups="apps_stk,pdk-fs" name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="c06b7815817fe7682c858cbe10494f671dd6bbd3" upstream="master"/>
+  <project name="platform/packages/apps/StorageManager" path="packages/apps/StorageManager" revision="a1c249013e65ec1fc38076cc29830c4367c8cace" upstream="master"/>
+  <project name="platform/packages/apps/TV" path="packages/apps/TV" revision="7416628255cd3c95b6ffecd331fbb0add9c1eea9" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="60102ca02f1a93af59cc479f2a80a40a382d668c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Terminal" path="packages/apps/Terminal" revision="e71d9d40b5b66d646f80081abea9893d3e0fdf59" upstream="master"/>
+  <project groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" revision="0fba4364b09c47766046e5afb12fd3304273323f" upstream="master"/>
+  <project groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" revision="f68ad8c913885a597dc41da70cbdc23477fe85a6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" revision="9648d6bc0a106576927264ab580e1a326fba920a" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail" revision="a3efe60e6b9e0045eef5f88491bc966868357300" upstream="master"/>
+  <project name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" revision="969934f908ff2ddda77bddbb80f206daf6a24281" upstream="master"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="e24ee92653e28ddf0020ffb9e5ddc99931117674" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="bde4c9a8dfa85ca71f034c371908358bf61a74f2" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="59aefa242169b7a51c2381daee58ff22fd1834ce" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="33d26f5eedb3d3011762ce5b2de66e931bf64b35" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider" revision="3aef9aef553a126b57fa9d7c271bf82abdb8ca9f" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/BookmarkProvider" path="packages/providers/BookmarkProvider" revision="3fa85d57a81d2cdfd08465d3dcb5e7ad4ad1f7ca" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="8da754fcd166e11363e4d031b0c42f2abe92238d" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/CallLogProvider" path="packages/providers/CallLogProvider" revision="8d79e5e0f0673f20aff55fdb6ccb297bdc509387" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="44c11b854e615a007eda9760f9c9d0323c9c73ba" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="ef033b3587853368d947c4d849eb5d6818cc612a" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="654f73a379a36e5f4cdb2fc4cdfbc06971bff212" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/PartnerBookmarksProvider" path="packages/providers/PartnerBookmarksProvider" revision="133b4fb575d32b7e2e887e2d1d6a9e6877b54440" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="22a5cfb7b166ad972c73d171a078a0932587bd44" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/TvProvider" path="packages/providers/TvProvider" revision="374df0a9f8c1b92b1bdb7572f30543188c8c7a1c" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="12907529afb603d10bc133e808728cef12e5dad6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic" revision="e72ef139782ca896dced7524abe7cfcc9ed35db1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable" revision="a9c5d50340fcef49034add6766576e4aab7d1168" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/screensavers/WebView" path="packages/screensavers/WebView" revision="6e0a80f6faed6191acc8ce1b6c79eada09e9e042" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" revision="5bd17d4644dccb6cd5e23c95490ea925082d42d3" upstream="master"/>
+  <project groups="adp8064,pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" revision="f9cfa43094ac3111c92283a0ce9db8e377ac47ab" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" revision="dfa0e3116b3ba72b9c2f308d8d11bc6ced6ad23b" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation" revision="87a0ebe5a071130fbb5d5117806964f4e8bc1a77" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" revision="d733a73a8d8362f24b8aa7a4073b74736203069e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" revision="4cd944d4b011c73cea1b126433e3ff3fe6e1aee0" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="313c31a2d7ff12d4f78d11458d8b268a5fe97d9c" upstream="master"/>
+  <project groups="pdk" name="platform/pdk" path="pdk" revision="708589163e790eb3a7fec09f4832a0f78999bdf3" upstream="master"/>
+  <project groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" revision="f831a34488fa3e6806bee32d7a85820a5645a428" upstream="master"/>
+  <project clone-depth="1" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" revision="f36d67e0b8fa645428c4ebf6f05c2974bc8337d9" upstream="master"/>
+  <project clone-depth="1" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" revision="83a0ec4746ab945004a9e71f2253d5fed8a4cc75" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" revision="3a47dbd8cf86afe7f72d48902a342a7894d9570a" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="f537089a258a89539154e8f3932f4c8bd1bdde30" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="5bebe70905a43b398bdb04a678bf6d50a2c4452e" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="97aa4a3b378ec49271f264cc41b79be3cf04d06e" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="cf90e197dcf00a26d0c1fc9192a3388001b816a3" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" revision="fb36c717664a98b82eecec4122431769c33489d3" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" revision="0c7d72c96f0e9c2b7cd8d4f33875f6424ab937e6" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/eclipse" path="prebuilts/eclipse" revision="7985a1e57e906ce50505fe37769773983cb2eb40" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="03e2ae15852449ae81ddaa54c35739af27180581" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="d8c414fc49e933c074f173e6d87795cc7fdcfedc" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="c3b7a175640fc59711614c0ad5269a037e06fe7a" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="e8a2f21c1cc7f87069da71bc2f1901acc4ea2bdf" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="ce9d77505072450d2f16a4bf06673f31d8d67ff0" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="ea9c88beb9ffbb1a0833cc3ee94b53950729473d" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="ed4f6b503e1d7f2bc03d87b90084e12e33f8be4f" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="73ca99196723f810dad42390d154654354f57c16" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="d3566f4f19b660d98ff237825ed775289c102420" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="a332df8dadd78866c2a57f2c7348d499952939c2" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="1944f44167a907969de5138fe4cc442432b7cc37" upstream="master"/>
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" revision="4a696dd19df2fee0ce24f5bdbd8ae0e03049f97b" upstream="master"/>
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" revision="172e21a7c836e6086c6faae7b080a38c779597ac" upstream="master"/>
+  <project clone-depth="1" groups="darwin,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="3a0d506bad18e41d9cbffd196c24d70d0c40d0ab" upstream="master"/>
+  <project clone-depth="1" groups="linux,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="3377874f67bcc7d200408ceb8b02169c4c3b201d" upstream="master"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" revision="ba09d77a59458527e92a4ee12bfdf0d7ac4ae6e2" upstream="master"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/libs/libedit" path="prebuilts/libs/libedit" revision="d32685dba4011664b590b94ad156bc734c2c9bb5" upstream="master"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" revision="e1ca35066d5b3ef63b188a3ffe8cb058feb9b83e" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" revision="3e120da701eb2dd7da9c986cbb11ff850805c252" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="2b88f8ee10044fe4b77a35c9587759d992561af2" upstream="master"/>
+  <project clone-depth="1" groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master"/>
+  <project clone-depth="1" groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="7bd52e8c08951d11ae4437e407c62566a1c3416d" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="895ce3d698d930484c18f97237699a4f5d2d6929" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="d36c987371321aa7ae38703810b4ea14945533e1" upstream="master"/>
+  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="3aca8cce121d427bc5cba6c355bfbfcd453a9395" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" revision="7fcb50b6f76f57eaf5fecbb6b5a0cafcfdf95500" upstream="master"/>
+  <project groups="pdk" name="platform/system/bt" path="system/bt" revision="ca6aea976d5e38e6cc9c22247812ac7deb58ea57" upstream="master"/>
+  <project groups="pdk" name="platform/system/ca-certificates" path="system/ca-certificates" revision="e312bd5044fc07e85b8b0c21b8f21a9329ce9636" upstream="master"/>
+  <project name="platform/system/connectivity/wificond" path="system/connectivity/wificond" revision="483bd8dcfd508095113cfde82e8b79ce6e29759f" upstream="master"/>
+  <project name="platform/system/connectivity/wifilogd" path="system/connectivity/wifilogd" revision="796315a7e25212d6dc3a998405e25bc877d57cc8" upstream="master"/>
+  <project groups="pdk" name="platform/system/core" path="system/core" revision="eb42bb8c8ba93b092e50e5426a07c692fa76d8b2" upstream="master"/>
+  <project groups="pdk" name="platform/system/extras" path="system/extras" revision="3cd4b5a765e824f0eb2441a51cd97d4a90f17127" upstream="master"/>
+  <project groups="pdk" name="platform/system/gatekeeper" path="system/gatekeeper" revision="c530d631aa9db4522f8b3e6879cf2280a1a1c903" upstream="master"/>
+  <project groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" revision="13e5d8a98e919e5638f681f38550eddcaf890937" upstream="master"/>
+  <project groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" revision="dcb3db439c1535a52c796a489e8a6087039e5a46" upstream="master"/>
+  <project groups="pdk" name="platform/system/keymaster" path="system/keymaster" revision="2a28077463ccde87fa0662eca097b1f58013c147" upstream="master"/>
+  <project name="platform/system/libfmq" path="system/libfmq" revision="fbfa0c6d654118ee34239b4d1b2d08a245353d70" upstream="master"/>
+  <project name="platform/system/libhidl" path="system/libhidl" revision="aea9f83e6d95a15de668716c627093b17c6bc229" upstream="master"/>
+  <project groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" revision="f234318905c87c80eaeb1546bafe9d8de55cf56f" upstream="master"/>
+  <project groups="pdk" name="platform/system/libufdt" path="system/libufdt" revision="ea5d3f72aa01de436f8e1e5bcdd7748d255285ad" upstream="master"/>
+  <project groups="pdk" name="platform/system/libvintf" path="system/libvintf" revision="bbfff3032efa6fccd6a4d975980ef8922f2c81d7" upstream="master"/>
+  <project groups="pdk" name="platform/system/media" path="system/media" revision="e338b979f9ff2d869691bfab1eb098b5f426c664" upstream="master"/>
+  <project groups="pdk" name="platform/system/netd" path="system/netd" revision="54c4105adbf78a29d67a13786f0ab43203412059" upstream="master"/>
+  <project groups="pdk" name="platform/system/nfc" path="system/nfc" revision="bdb53f8487bf83e36666f5cbe247d7156a057bfa" upstream="master"/>
+  <project name="platform/system/nvram" path="system/nvram" revision="48087181f977c4f75c81705361f455f5ee9c7c37" upstream="master"/>
+  <project groups="pdk" name="platform/system/security" path="system/security" revision="975e1aae69f9bcdb35de5b2b8f466514f5fe4ba2" upstream="master"/>
+  <project groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" revision="a92d3135619f83098600c65df62665c448497ee8" upstream="master"/>
+  <project groups="pdk" name="platform/system/timezone" path="system/timezone" revision="77a2eb768c17298c79b5d594e7669a92b88f7fef" upstream="master"/>
+  <project groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" revision="babca26b0faa5e41ced0b39cb135fb181a81fa1a" upstream="master"/>
+  <project groups="pdk" name="platform/system/tools/hidl" path="system/tools/hidl" revision="a1b227c5551b207793cfc2f7c0803c791a853c51" upstream="master"/>
+  <project name="platform/system/tpm" path="system/tpm" revision="dd2735f149fe58555efa004e330a49ee71954d3f" upstream="master"/>
+  <project groups="pdk" name="platform/system/update_engine" path="system/update_engine" revision="929461ab11769339108658f2022d068446ca90f7" upstream="master"/>
+  <project groups="pdk" name="platform/system/vold" path="system/vold" revision="4ad7784b07c476800dcbad1e9a749e02812b2d9e" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" revision="02ce6b6c477e72daeebd9122531b397a8c102c04" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" revision="30d457ce6613d587901379844b9d0dfb37a67a7b" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" revision="0a064803e1ebbfd5e587e9baf677d458a4e3bbd8" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts" path="test/vts" revision="f799c3ff22301ee29b3feb949322e5951aba9d92" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/fuzz" path="test/vts-testcase/fuzz" revision="6af0bde5881d2ab0366bf9479f151e5f3bbc32b6" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" revision="319ccd4df317c426f790a9117a57f892ff715501" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/hal-trace" path="test/vts-testcase/hal-trace" revision="a0a4488258c74bb0c61a71b3c4c4aacfd4ed210d" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" revision="2dbc05a69a87109b04ba9462bf39d2209202d0b0" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/performance" path="test/vts-testcase/performance" revision="04538ffdca38754da367d51ed825999727654654" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" revision="3c8938ec3c75b4b6a4649a22d3478822ac2dedd7" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" revision="b2b66733c0b5717736d96945e02ee2926583cc5b" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" revision="0e3881fa383ee9edee07074d06dcdf7cdaa69832" upstream="master"/>
+  <project groups="tools" name="platform/tools/external/fat32lib" path="tools/external/fat32lib" revision="70067d87eb7b1cf6eb84a5c3d476225898177eba" upstream="master"/>
+  <project groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" revision="bd3466bb3119802994f2d149bab648af567335a2" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" revision="53720799c7f266384c3d2cb032082a94f0730cae" upstream="master"/>
+  <project groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="4c4e78c4d9b52a1a5c5ed11c39ab36d258037a2c" upstream="master"/>
+  <project groups="pdk" name="platform/tools/test/connectivity" path="tools/test/connectivity" revision="42411489d74dbc097cc5353bbab82bbab29cbac5" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" revision="7100660d5379dc3fd8124daa3bdeb4c92d041b35" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" revision="520eaa2ec95619705f8574c1b7e47e4fea28b654" upstream="master"/>
+  <project name="toolchain/binutils" revision="1661a29f471199a57719ff27eed5af7d7714376e" upstream="master"/>
+  
+  <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks"/>
+</manifest>
diff --git a/tests/2017-07-07/art.tar.gz.sha1 b/tests/2017-07-07/art.tar.gz.sha1
new file mode 100644
index 0000000..1e47399
--- /dev/null
+++ b/tests/2017-07-07/art.tar.gz.sha1
@@ -0,0 +1 @@
+9d6bcb910bfb306033f18a359063195dec7be1ae
\ No newline at end of file
diff --git a/tools/create_art_tests.py b/tools/create_art_tests.py
index 99d64d2..b9b25c3 100755
--- a/tools/create_art_tests.py
+++ b/tools/create_art_tests.py
@@ -10,7 +10,7 @@
 from shutil import rmtree
 
 OUTPUT_DIR = "build/generated/test/java/com/android/tools/r8/art"
-TEST_DIR = "tests/art"
+TEST_DIR = "tests/2017-07-07/art"
 TOOLCHAINS = ["dx", "jack", "none"]
 TOOLS = ["r8", "d8"]
 TEMPLATE = Template(
diff --git a/tools/linux/README.art-versions b/tools/linux/README.art-versions
index d4c79ec..ceb30a7 100644
--- a/tools/linux/README.art-versions
+++ b/tools/linux/README.art-versions
@@ -8,9 +8,10 @@
   angler: Nexus 6P
   mako: Nexus 4
 
+
 art (default)
----------
-Build from branch master with art
+-------------
+Build from AOSP branch master. To update to a new AOSP master
 
   mkdir master
   cd master
@@ -26,6 +27,20 @@
 
   scripts/update-host-art.sh --android-checkout ~/android/master --art-dir art
 
+The precise info for the AOSP master used is in aosp_master_manifest.xml, which is
+produced using this command:
+
+  repo manifest -o aosp_master_manifest.xml -r
+
+To reproduce that AOSP state, use the following commands:
+
+  mkdir master
+  cd master
+  mkdir -p .repo/manifests
+  cp <r8-checkout>/aosp_master_manifest.xml .repo/manifests
+  repo init -u https://android.googlesource.com/platform/manifest -m aosp_master_manifest.xml
+  <continue with repo sync as above>
+
 
 art-7.0.0
 ---------
@@ -100,6 +115,7 @@
 
   scripts/update-host-art.sh --android-checkout ~/android/7.0.0_r21 --art-dir art-7.0.0
 
+
 art-6.0.1
 ---------
 Build from branch android-6.0.1_r66 with the following patch:
@@ -174,6 +190,7 @@
 
   scripts/update-host-art.sh --android-checkout ~/android/6.0.1_r66 --art-dir art-6.0.1
 
+
 art-5.1.1
 ---------
 Build from branch 5.1.1_r19 with the following patch:
diff --git a/tools/linux/aosp_master_manifest.xml b/tools/linux/aosp_master_manifest.xml
new file mode 100644
index 0000000..85c7b5c
--- /dev/null
+++ b/tools/linux/aosp_master_manifest.xml
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
+  
+  <default remote="aosp" revision="master" sync-j="4"/>
+  
+  <project groups="device,fugu,broadcom_pdk,pdk" name="device/asus/fugu" revision="80ed1ee63bc5b4480cf18925ac644517b97f3179" upstream="master"/>
+  <project clone-depth="1" groups="device,fugu,broadcom_pdk,pdk" name="device/asus/fugu-kernel" revision="8a09131453b9326793261b6c9297f3c43336d6b5" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk" name="device/common" revision="81fa95978b5542b9d2851b04d034b9a75ed8b43b" upstream="master"/>
+  <project groups="pdk" name="device/generic/arm64" revision="23d9a6b57c63fbea914ae663a0be693b43d91ffc" upstream="master"/>
+  <project groups="pdk" name="device/generic/armv7-a-neon" revision="dd168c481dcb14c7932c7026ac7c8b4af128e4a5" upstream="master"/>
+  <project groups="pdk" name="device/generic/common" revision="11c092a6cbfcf6207f07a9a8e3398e747e7f5461" upstream="master"/>
+  <project groups="pdk" name="device/generic/goldfish" revision="eb66ec9609a6c6422cfec97074eaefe9b3b436cd" upstream="master"/>
+  <project groups="pdk" name="device/generic/goldfish-opengl" revision="b0a0e2f0297a1b379dd460dbb74153773196238c" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-arm64" revision="6f2e6974a1b1dc0ef936aec732e33d553c000b5e" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-armv7-a-neon" revision="9d7cbb60819a1da8408a7148b965b4cd1ebbb570" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-mips" revision="544e69736cff911c286a5d1d300dac228e23a73f" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-mips64" revision="b1c36d0847fe6366527efd38fdb29d757ea887ee" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-x86" revision="65d59e2be2cfd713513a05d80a0f75794ab60579" upstream="master"/>
+  <project groups="pdk" name="device/generic/mini-emulator-x86_64" revision="bcb1f5139c24bebbb0cc0ebd2f50d83cd21b01b9" upstream="master"/>
+  <project groups="pdk" name="device/generic/mips" revision="23901a9cf7a62f5f8f9f0c1382b5707694a1661c" upstream="master"/>
+  <project groups="pdk" name="device/generic/mips64" revision="03b4192ab5125e5d67636dc4c7121f089799e1fb" upstream="master"/>
+  <project groups="pdk" name="device/generic/qemu" revision="99feb6138f39e392495057ef7f2c4a5ed27f9e2d" upstream="master"/>
+  <project groups="device,pdk" name="device/generic/uml" revision="c2e8fa7d294d2b83bbe6054dd7b94139517e8637" upstream="master"/>
+  <project groups="pdk" name="device/generic/x86" revision="dac918b4cd4a34342526588502e4b5a531183080" upstream="master"/>
+  <project groups="pdk" name="device/generic/x86_64" revision="f00aa59b3af4937ed014701755e9b01c95122187" upstream="master"/>
+  <project groups="device,pdk" name="device/google/accessory/arduino" revision="abc5159a3ca9dbb5c7e364a1eab99901a4440ac5" upstream="master"/>
+  <project groups="device,pdk" name="device/google/accessory/demokit" revision="7dfe7f89a3b174709c773fe319531006e46440d9" upstream="master"/>
+  <project groups="device,fugu,broadcom_pdk,generic_fs,pdk" name="device/google/atv" revision="fbc45fb7c00d9b0150acdb674c9525ab32abe349" upstream="master"/>
+  <project groups="device,pdk" name="device/google/contexthub" revision="fd765cf358dba4be60b62ee068d6d0cc41674319" upstream="master"/>
+  <project groups="device,dragon,pdk" name="device/google/dragon" revision="0c29277c7842d8fe7b6ba49b2af35196030f093b" upstream="master"/>
+  <project clone-depth="1" groups="device,dragon,pdk" name="device/google/dragon-kernel" revision="8c9e4d14540119e0815a453eb4fefbedeaf8794f" upstream="master"/>
+  <project groups="device,marlin" name="device/google/marlin" revision="d5980c0fc2b2f63bf2b3efc94f527e6fb5cf594c" upstream="master"/>
+  <project clone-depth="1" groups="device,marlin" name="device/google/marlin-kernel" revision="48bde4626f5da9605b068b6c1bcc1e854a876d52" upstream="master"/>
+  <project groups="device,angler,broadcom_pdk,pdk" name="device/huawei/angler" revision="602d56d59460ce359dccaa418687bbe95a0619bb" upstream="master"/>
+  <project clone-depth="1" groups="device,angler,broadcom_pdk,pdk" name="device/huawei/angler-kernel" revision="db808069857bd03e573ce3c765dd6df43f2a4318" upstream="master"/>
+  <project groups="device,bullhead,pdk" name="device/lge/bullhead" revision="45cfd5d7594c92ff992e35f80c115b3db06f5d8a" upstream="master"/>
+  <project clone-depth="1" groups="device,bullhead,pdk" name="device/lge/bullhead-kernel" revision="3f270065c17302930cc9319d399297436b65b3bc" upstream="master"/>
+  <project name="device/linaro/bootloader/OpenPlatformPkg" revision="71183d6eabb1f91198f1bd3705a85b419cfd4685" upstream="master"/>
+  <project name="device/linaro/bootloader/arm-trusted-firmware" revision="36aa82dda56169333aba6b2c55341404c1d631f0" upstream="master"/>
+  <project name="device/linaro/bootloader/edk2" revision="b26de945921c8045494d7817e2c962b2b73c80dc" upstream="master"/>
+  <project groups="device,hikey,pdk" name="device/linaro/hikey" revision="14fc8793687878c840f48f6c6c7a4d00aa628c16" upstream="master"/>
+  <project clone-depth="1" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" revision="60b637267e3d3b5140590649651c7033375aafb7" upstream="master"/>
+  <project groups="pdk" name="device/sample" revision="15f7857fc7b7f7cfd99ec4f93b151dc02a71b837" upstream="master"/>
+  <project name="kernel/tests" revision="a32e3eadb010ed3143bcebe0b588678b7627884b" upstream="master"/>
+  <project groups="pdk" name="platform/art" path="art" revision="d64fbfa3471c47d6628d6014bc4a3ac780abd26a" upstream="master"/>
+  <project groups="pdk" name="platform/bionic" path="bionic" revision="f45bc14d5497c30bd43e22d025e3b88812b2baa4" upstream="master"/>
+  <project groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" revision="c8e338fa9c19e3a017a9641035279c23e5c57d8d" upstream="master"/>
+  <project groups="pdk" name="platform/build" path="build/make" revision="5e19557eb99d75ca37a2fbbfb992c135f080bf0a" upstream="master">
+    <copyfile dest="Makefile" src="core/root.mk"/>
+    <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk"/>
+    <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default"/>
+    <linkfile dest="build/core" src="core"/>
+    <linkfile dest="build/envsetup.sh" src="envsetup.sh"/>
+    <linkfile dest="build/target" src="target"/>
+    <linkfile dest="build/tools" src="tools"/>
+  </project>
+  <project groups="pdk,tradefed" name="platform/build/blueprint" path="build/blueprint" revision="8d20586d568d04037c258a25a5350676276351ab" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/build/kati" path="build/kati" revision="bcb31defde3e3fc248a1f11049e7722233003b6f" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/build/soong" path="build/soong" revision="36242850fdad11b4e6fbe061ef30f62e7e8c08d8" upstream="master">
+    <linkfile dest="Android.bp" src="root.bp"/>
+    <linkfile dest="bootstrap.bash" src="bootstrap.bash"/>
+  </project>
+  <project groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" revision="644a1933b78f1b08e86cecb58e199cd43ff7bd26" upstream="master"/>
+  <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" revision="724940ddcf92145c33290f2194e996b5b2cb7f57" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" revision="466473ac872cbc6a37815458d2149c41d54ce52e" upstream="master"/>
+  <project name="platform/developers/build" path="developers/build" revision="67343aa8a5faeb6b4df459dbfce4cc17bc7f21f9" upstream="master"/>
+  <project name="platform/developers/demos" path="developers/demos" revision="95d49d216223e3431647abd79f5e376958353c95" upstream="master"/>
+  <project name="platform/developers/samples/android" path="developers/samples/android" revision="b329d0bb80feecf6a27d38fe0bb3c018a2ba16aa" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/development" path="development" revision="37c32c31621339af71b62dbc7986358ed629083e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/docs/source.android.com" path="docs/source.android.com" revision="14605d77b5e0aabc741b2b69d53e9e772f010b23" upstream="master"/>
+  <project groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" revision="7a8860406c015bbc63f382efed9372044eb0cb74" upstream="master"/>
+  <project groups="pdk" name="platform/external/Microsoft-GSL" path="external/Microsoft-GSL" revision="44079759f93259a9694607502406dfe3717b04ba" upstream="master"/>
+  <project groups="pdk" name="platform/external/aac" path="external/aac" revision="db596910262534891ecde361a71abe7ada57405a" upstream="master"/>
+  <project groups="pdk" name="platform/external/abi-compliance-checker" path="external/abi-compliance-checker" revision="c692633e1b2dddfb8f5ec7f60eb7a62ced325e4f" upstream="master"/>
+  <project groups="pdk" name="platform/external/abi-dumper" path="external/abi-dumper" revision="9b76336c02d84eeea19a48108270e3bae4efd025" upstream="master"/>
+  <project groups="pdk" name="platform/external/android-clat" path="external/android-clat" revision="e700a73dd03a0c111a8a55ef2f9f22b264663138" upstream="master"/>
+  <project groups="pdk" name="platform/external/androidplot" path="external/androidplot" revision="c66727ebf001607cee14521c35bc852b55fd9845" upstream="master"/>
+  <project groups="pdk" name="platform/external/ant-glob" path="external/ant-glob" revision="a73228afa9540b9c5518d360c5ae630bb634f975" upstream="master"/>
+  <project groups="pdk" name="platform/external/antlr" path="external/antlr" revision="dd5fa6d48b827c5d98b625adbc209f4a05567534" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-commons-math" path="external/apache-commons-math" revision="18f62fca59d387e3c1ccd8f80087d9c9af40bcc8" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-harmony" path="external/apache-harmony" revision="a0527d8a473efb03b95e3402127974c0523b596e" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-http" path="external/apache-http" revision="a4b31e5eda3df5a0ffe844891edc5bbb33930e98" upstream="master"/>
+  <project groups="pdk" name="platform/external/apache-xml" path="external/apache-xml" revision="31d7642eb8f37a9166db7f1c9e313ab651bdb8ba" upstream="master"/>
+  <project groups="pdk" name="platform/external/archive-patcher" path="external/archive-patcher" revision="66e3a02481a0fcfcaaea296c0ec4daf761d3a07c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/external/autotest" path="external/autotest" revision="93023b12440976e4b620d5d33af1928288c97dc2" upstream="master"/>
+  <project groups="pdk" name="platform/external/avb" path="external/avb" revision="047ecf7d2361ffcb39a5a4ec0709480f47ed76e2" upstream="master"/>
+  <project groups="pdk" name="platform/external/bison" path="external/bison" revision="7467d52af437dd3dfea237a6865ab84bf258dee0" upstream="master"/>
+  <project groups="pdk" name="platform/external/blktrace" path="external/blktrace" revision="d345431f16b8f76f30a58193ff2b26d5853e1109" upstream="master"/>
+  <project groups="pdk" name="platform/external/boringssl" path="external/boringssl" revision="e56da3e0a18add8be1571c4ae616492a0258ebea" upstream="master"/>
+  <project groups="pdk" name="platform/external/bouncycastle" path="external/bouncycastle" revision="6ec33a667cad9a33e8049206a0507fcece28fd9c" upstream="master"/>
+  <project groups="pdk" name="platform/external/brotli" path="external/brotli" revision="7e4c269545df05725341167068c54b55b7d03370" upstream="master"/>
+  <project groups="pdk" name="platform/external/bsdiff" path="external/bsdiff" revision="61a6197566d4230c9a86a61e6c5f605778ab3733" upstream="master"/>
+  <project groups="pdk" name="platform/external/bzip2" path="external/bzip2" revision="0600e5668b2b1590c2f908a5c420149c6581122e" upstream="master"/>
+  <project groups="pdk" name="platform/external/c-ares" path="external/c-ares" revision="211489aeaed3157c34e46f350afea813960258af" upstream="master"/>
+  <project groups="pdk" name="platform/external/caliper" path="external/caliper" revision="eef51080212521ca9c85eb880dd1d6620846cf92" upstream="master"/>
+  <project groups="pdk" name="platform/external/cblas" path="external/cblas" revision="d7e8ee81279845e0f06103398b48d3f4624497b4" upstream="master"/>
+  <project groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" revision="5bb2c7930cf34cfe7584b76139b5257feec81e6c" upstream="master"/>
+  <project groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" revision="a70bd790dfd509cefb24534d02e3a1b349faf98d" upstream="master"/>
+  <project groups="pdk" name="platform/external/chromium-webview" path="external/chromium-webview" revision="581a777a866d78be6cb4192e46891e418930fc1b" upstream="master"/>
+  <project groups="pdk" name="platform/external/clang" path="external/clang" revision="0f9f1869a4596b973fb6d65324924365d3cf5884" upstream="master"/>
+  <project groups="pdk" name="platform/external/cmockery" path="external/cmockery" revision="9199c7bfafefea32d1884182fa655b6e4578c1c4" upstream="master"/>
+  <project groups="pdk" name="platform/external/compiler-rt" path="external/compiler-rt" revision="8bdaf98eeb4dd0f7b8cae390cd18c097a9eb4e2f" upstream="master"/>
+  <project groups="pdk" name="platform/external/conscrypt" path="external/conscrypt" revision="bd086d9c0704b340879f925741567e5a6610b333" upstream="master"/>
+  <project groups="pdk" name="platform/external/crcalc" path="external/crcalc" revision="5559610bea3b267abef3273868f2d6b8c01409a5" upstream="master"/>
+  <project groups="pdk" name="platform/external/cros/system_api" path="external/cros/system_api" revision="32d297d055471c3bac3a89763e0cf0ef6483bff1" upstream="master"/>
+  <project groups="pdk" name="platform/external/curl" path="external/curl" revision="f0f7cd5b375b317e7eef65b6573902c04ee80ecc" upstream="master"/>
+  <project groups="pdk" name="platform/external/dagger2" path="external/dagger2" revision="41a53344ccbb242099a57ded9d1337430c1b5f8c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" revision="f5e7ab6b79b2b0ec1b87d5f28997c44223e46766" upstream="master"/>
+  <project groups="pdk" name="platform/external/desugar" path="external/desugar" revision="ee13d6b51a19ff1dccbd9015420e07f544169f8c" upstream="master"/>
+  <project groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" revision="9e6367a9399bb671b1b474bf21898d2ca68b6357" upstream="master"/>
+  <project groups="pdk" name="platform/external/dhcpcd-6.8.2" path="external/dhcpcd-6.8.2" revision="df64c96f01b3dd2a823d6aa788653c3bedd1efda" upstream="master"/>
+  <project groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" revision="6661f3ca66b55d8f5a57b96fec97efaf8f3897a5" upstream="master"/>
+  <project groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" revision="4cafaba2321b7b74f81c621aa01112156258adb3" upstream="master"/>
+  <project groups="pdk" name="platform/external/dnsmasq" path="external/dnsmasq" revision="00d11a4477637375322692d0c5603c60d38c6f1a" upstream="master"/>
+  <project groups="pdk" name="platform/external/doclava" path="external/doclava" revision="f381ec7f6fca0618fb01231a758402597b1239e3" upstream="master"/>
+  <project groups="pdk" name="platform/external/donuts" path="external/donuts" revision="005389fb31a67841b5de42f0d25fbfab843e208c" upstream="master"/>
+  <project groups="drm_gralloc,pdk-fs" name="platform/external/drm_gralloc" path="external/drm_gralloc" revision="e19443ea00d3b27622590b920819e53da68f7fda" upstream="master"/>
+  <project groups="drm_hwcomposer,pdk-fs" name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer" revision="578059aa61b0a7e0a56e10d849bc978783a473d6" upstream="master"/>
+  <project groups="pdk" name="platform/external/droiddriver" path="external/droiddriver" revision="059f2d82efbcc733574b2b90dbf999280c04c4f1" upstream="master"/>
+  <project groups="pdk" name="platform/external/drrickorang" path="external/drrickorang" revision="8ea137d1086e621188f70ffac34a6ba8924af2c6" upstream="master"/>
+  <project name="platform/external/dtc" path="external/dtc" revision="b1d8b2cd5e57a5c97bdd011624c06c40052b821e" upstream="master"/>
+  <project groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="7975672f634b603c4b4ff614e046c4e18b4561c6" upstream="master"/>
+  <project groups="pdk" name="platform/external/easymock" path="external/easymock" revision="8bc2748f2850c88ab6b86c6ceed1ce65bed5ee16" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/eclipse-basebuilder" path="external/eclipse-basebuilder" revision="076f46888ed346775b8efc564d7694063ef5eea7" upstream="master"/>
+  <project groups="pdk" name="platform/external/eclipse-windowbuilder" path="external/eclipse-windowbuilder" revision="c533332008088ee5f61745b724361fbde5b7e770" upstream="master"/>
+  <project groups="pdk" name="platform/external/eigen" path="external/eigen" revision="cfefb1dc11c33fb8a74291cf2b08e3aa49cb879a" upstream="master"/>
+  <project groups="pdk" name="platform/external/elfutils" path="external/elfutils" revision="2ed2550b8595fde721dbc6a12091609a598192af" upstream="master"/>
+  <project groups="pdk" name="platform/external/emma" path="external/emma" revision="deb5711b2635ee9d332605e2e00b63b32bed6777" upstream="master"/>
+  <project groups="pdk" name="platform/external/esd" path="external/esd" revision="943c42b6f8e9afe821744aa4c039f4943ebf29f5" upstream="master"/>
+  <project groups="pdk" name="platform/external/expat" path="external/expat" revision="8954a5667c2941642b9f63bec3a0482a8e9eeab3" upstream="master"/>
+  <project groups="pdk" name="platform/external/eyes-free" path="external/eyes-free" revision="16bd4c7a4d1bfe229068b637614dad7c48dd2ceb" upstream="master"/>
+  <project groups="pdk" name="platform/external/f2fs-tools" path="external/f2fs-tools" revision="85b4766bedbbe8b2dfdc23b401194c9dd3c60dd0" upstream="master"/>
+  <project groups="pdk" name="platform/external/fdlibm" path="external/fdlibm" revision="fcd17254a9e59ceb0420d4a2faf29db6b004c443" upstream="master"/>
+  <project groups="pdk" name="platform/external/fec" path="external/fec" revision="b3e9d18f59759ff5407be13ef8c6d2e2a497305e" upstream="master"/>
+  <project groups="pdk" name="platform/external/fio" path="external/fio" revision="138dfa04ca2e19c0f03b4d0b591ca2d5e3bad3df" upstream="master"/>
+  <project groups="pdk" name="platform/external/flac" path="external/flac" revision="9654326e6af758bf25e50f15a7e7b9cff6755a78" upstream="master"/>
+  <project groups="pdk" name="platform/external/fmtlib" path="external/fmtlib" revision="1ce26af6d14810a277a5f62a5619a372b93183cc" upstream="master"/>
+  <project groups="pdk" name="platform/external/fonttools" path="external/fonttools" revision="fede58680958e96e6e8f61c3cc6282f798452c53" upstream="master"/>
+  <project groups="pdk" name="platform/external/freetype" path="external/freetype" revision="613f720f08f579806a05f0e45927f4f9ff147885" upstream="master"/>
+  <project groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="9d1e7e4558c8b53731ba1d06d33b5516934d1ff7" upstream="master"/>
+  <project groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" revision="b76ecb153a784e70e07bf7e19bcf3dfd6caec815" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/giflib" path="external/giflib" revision="a6e0183cdd9f69b180b4adbd613e66772d9bc633" upstream="master"/>
+  <project groups="pdk" name="platform/external/glide" path="external/glide" revision="31e64acd1e65045471124267a06241eff1f55d26" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" revision="983f59ce9add3687c81e2ea5f61027c4c9d6a3b9" upstream="master"/>
+  <project groups="dragon,pdk-fs" name="platform/external/google-breakpad" path="external/google-breakpad" revision="31bf6fed97629fd3420cda58a97469ec7e5389f0" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/carrois-gothic-sc" path="external/google-fonts/carrois-gothic-sc" revision="0062a10458d4c357f3082d66bcb129d11913aaae" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/coming-soon" path="external/google-fonts/coming-soon" revision="2c5cb418c690815545bbb0316eae5fd33b9fc859" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/cutive-mono" path="external/google-fonts/cutive-mono" revision="bce2136662854076023066602526ba299e6556b2" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-fonts/dancing-script" path="external/google-fonts/dancing-script" revision="7b6623bd54cee3e48ae8a4f477f616366643cc78" upstream="master"/>
+  <project groups="pdk" name="platform/external/google-tv-pairing-protocol" path="external/google-tv-pairing-protocol" revision="84cad11e5d8c3000472e8bb22dc698cf9b3c8612" upstream="master"/>
+  <project groups="pdk" name="platform/external/googletest" path="external/googletest" revision="ff9b10309a390a7d631edc7808e129237972245b" upstream="master"/>
+  <project groups="pdk" name="platform/external/gptfdisk" path="external/gptfdisk" revision="165c596ac3c69ecbc5a424ad9c1f1be6d44d0bb3" upstream="master"/>
+  <project groups="pdk" name="platform/external/guava" path="external/guava" revision="5000b35f73a42ddb5554aa4c1c5ffea9c999741d" upstream="master"/>
+  <project groups="pdk" name="platform/external/guice" path="external/guice" revision="411312e790280e72c08e018134d7e3a0e7ebab76" upstream="master"/>
+  <project groups="pdk" name="platform/external/hamcrest" path="external/hamcrest" revision="0d446c0a6f5ab27bf24d8e046f1d03ce40f09594" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" revision="6dd5ce2e32bc4a474b6ae7f0c3b6059a995ea5a7" upstream="master"/>
+  <project groups="pdk" name="platform/external/hyphenation-patterns" path="external/hyphenation-patterns" revision="dedeff64279b77bafff72b6d866efc93e829b4ab" upstream="master"/>
+  <project groups="pdk" name="platform/external/icu" path="external/icu" revision="f7d5c16a1e76d13dff10f99f64f8b19425401651" upstream="master"/>
+  <project groups="pdk" name="platform/external/ims" path="external/ims" revision="711f9d55979cfe28b19a502cbe13a4d7e7e674f0" upstream="master"/>
+  <project groups="pdk" name="platform/external/iproute2" path="external/iproute2" revision="1b32ccb0313537bd0bebcb6ec3c0398e90aa103a" upstream="master"/>
+  <project groups="pdk" name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="afbdf60e1d4cafe0f894fe8e8e5bfa49e47c80b2" upstream="master"/>
+  <project groups="pdk" name="platform/external/iptables" path="external/iptables" revision="9eeff146a05de990eb2199092b5259184e7cab4b" upstream="master"/>
+  <project groups="pdk" name="platform/external/iputils" path="external/iputils" revision="940e24bb44d68ec7d600ef6d07e458a448d4c6fb" upstream="master"/>
+  <project groups="pdk" name="platform/external/iw" path="external/iw" revision="6a3e9a164c98577c28c0c9b1b9a0fbe7d7436e47" upstream="master"/>
+  <project groups="pdk" name="platform/external/jacoco" path="external/jacoco" revision="b1b164ac860eddaed3abfb819df73bfcccdaa327" upstream="master"/>
+  <project groups="pdk" name="platform/external/jarjar" path="external/jarjar" revision="7adc960353812730b4fb15a72901056cf3b3c516" upstream="master"/>
+  <project groups="pdk" name="platform/external/javasqlite" path="external/javasqlite" revision="ee41d81872eedc632f42bd231b95bc945690d159" upstream="master"/>
+  <project groups="pdk" name="platform/external/javassist" path="external/javassist" revision="f7c4b954072e563b75f6910c25bb689bbf38a3d1" upstream="master"/>
+  <project groups="pdk" name="platform/external/jcommander" path="external/jcommander" revision="68545397d8332a61f800ce9617715a22445ed9a9" upstream="master"/>
+  <project groups="pdk" name="platform/external/jdiff" path="external/jdiff" revision="62f4ca1f64eaeb0896416949d6120b912ac67d3b" upstream="master"/>
+  <project groups="pdk" name="platform/external/jemalloc" path="external/jemalloc" revision="a6f685beacaa3f8da06cb28f38bb559eac7d4dda" upstream="master"/>
+  <project groups="pdk" name="platform/external/jetty" path="external/jetty" revision="3077b6f9426ccafb6bd5c00a748e1d40af9e1ae5" upstream="master"/>
+  <project groups="tradefed,pdk-fs" name="platform/external/jline" path="external/jline" revision="74812032f8d8eddbef387f18c96de9e5c38b8fdb" upstream="master"/>
+  <project groups="pdk" name="platform/external/jmdns" path="external/jmdns" revision="0c71647deb7f7835c473fd3dfb45943083e47794" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsilver" path="external/jsilver" revision="b9b84920ba47ddf7f15baa01c56b28e3d3f951ea" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsmn" path="external/jsmn" revision="45f59951efef6cd2924738c39a5f52d61e06eb79" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsoncpp" path="external/jsoncpp" revision="ecd640d0acf7c93c5dbfc37702e4eedbc18aa850" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsr305" path="external/jsr305" revision="333c5e0ea34930a10785f53e74dbe997d93ad2d8" upstream="master"/>
+  <project groups="pdk" name="platform/external/jsr330" path="external/jsr330" revision="de30ee496a13d0f71d8ddaee1e247c3e8e43e58d" upstream="master"/>
+  <project groups="pdk" name="platform/external/junit" path="external/junit" revision="2faf8f4ae953dd2e847536c2712bbc563e34949a" upstream="master"/>
+  <project groups="pdk" name="platform/external/junit-params" path="external/junit-params" revision="b03560c32573b9057dc1daaf877501dbb4e16f8d" upstream="master"/>
+  <project groups="pdk" name="platform/external/kernel-headers" path="external/kernel-headers" revision="134f6bdcbfc9aae59db447822413388b49537864" upstream="master"/>
+  <project groups="pdk" name="platform/external/kmod" path="external/kmod" revision="087bd70f9a816bc37d77ef71c0b8f4253e60169e" upstream="master"/>
+  <project groups="pdk" name="platform/external/ksoap2" path="external/ksoap2" revision="3f3695df2e974811a5759d43f3532dcd9d6be26c" upstream="master"/>
+  <project groups="pdk" name="platform/external/libavc" path="external/libavc" revision="f4a17ae216f420f5d46e8680d4aa9317e6a9a4d8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libbackup" path="external/libbackup" revision="a645153b0a97663636bacdc5527c0d304fa79657" upstream="master"/>
+  <project groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" revision="9471399027d4a8e0ef5e1a68429b2e9e93a31e96" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcap" path="external/libcap" revision="64dcb22b223e3aae866d44ff35dc3acc2a9c58e8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcap-ng" path="external/libcap-ng" revision="835f318b9785a70415980fba96c34ee5c6b7e415" upstream="master"/>
+  <project groups="pdk" name="platform/external/libchrome" path="external/libchrome" revision="f320c0cf71af274e34404746d4303e6a2452e2d6" upstream="master"/>
+  <project groups="pdk" name="platform/external/libconstrainedcrypto" path="external/libconstrainedcrypto" revision="e1a8625038e715f0b14fd5466c02f0142673b1ec" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/libcups" path="external/libcups" revision="2447373f182dbfeb47fb86c0f5a6ac5773c65ac2" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcxx" path="external/libcxx" revision="0aea6aeca494754446dd1e5fe638fe68da128036" upstream="master"/>
+  <project groups="pdk" name="platform/external/libcxxabi" path="external/libcxxabi" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="master"/>
+  <project groups="pdk" name="platform/external/libdaemon" path="external/libdaemon" revision="e2f604066d97431c95856c73d7b9ee46b348d37e" upstream="master"/>
+  <project groups="pdk" name="platform/external/libdivsufsort" path="external/libdivsufsort" revision="90d90b27c0b82cac20deabac79e97e274856eaf8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libdrm" path="external/libdrm" revision="791d9b9fd9bd768bc81f5f224fb5fc2904035fa5" upstream="master"/>
+  <project groups="pdk" name="platform/external/libedit" path="external/libedit" revision="67e14dfc833aafa400a3aad8cb329cbaec503445" upstream="master"/>
+  <project groups="pdk" name="platform/external/libese" path="external/libese" revision="5ab3613225e1e73ae9d04b7e1555c124752ccbf8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libevent" path="external/libevent" revision="596447c7ff2881a67e7082c905112584c3e61a17" upstream="master"/>
+  <project groups="pdk" name="platform/external/libexif" path="external/libexif" revision="2431bfa79df74fbb6e30b77ab9f3d89c300d18ae" upstream="master"/>
+  <project groups="pdk" name="platform/external/libgdx" path="external/libgdx" revision="5f9bb1dadc7e51a5fdb7171280366f8b3ec86eb8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libgsm" path="external/libgsm" revision="4a3459a3528b7f11cf09acfa2d2a1fb5142c1c2b" upstream="master"/>
+  <project groups="pdk" name="platform/external/libhevc" path="external/libhevc" revision="5d3d1a0a65949b09035cc366429f7f85215c2731" upstream="master"/>
+  <project groups="pdk" name="platform/external/libjpeg-turbo" path="external/libjpeg-turbo" revision="b8a887c09706633ac22ad6d13c9464b2ee539e77" upstream="master"/>
+  <project groups="pdk" name="platform/external/libldac" path="external/libldac" revision="94b3caf1fecd5261e6929469924b1e25aaeca0ff" upstream="master"/>
+  <project groups="pdk" name="platform/external/liblzf" path="external/liblzf" revision="a88b9629447deabe8697d2f8fd4cc70aa6e1b563" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmicrohttpd" path="external/libmicrohttpd" revision="1e68f5d827a859ba3b7ab6a70a60247e0b96afa5" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmojo" path="external/libmojo" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmpeg2" path="external/libmpeg2" revision="a0f640e21e42f5905d760ec3df1dc5203d0d209b" upstream="master"/>
+  <project groups="pdk" name="platform/external/libmtp" path="external/libmtp" revision="7ed2065db3ab9851f47426f3a35ba7045ce528b2" upstream="master"/>
+  <project name="platform/external/libnetfilter_conntrack" path="external/libnetfilter_conntrack" revision="436dd293ff5503828a1fa33d725a1db87e4e03ed" upstream="master"/>
+  <project name="platform/external/libnfnetlink" path="external/libnfnetlink" revision="6cd19f65ff99f6deb836937c38fb9eedc113c101" upstream="master"/>
+  <project groups="pdk" name="platform/external/libnl" path="external/libnl" revision="defabfc078080d60369d901d3c7662f05605cb29" upstream="master"/>
+  <project groups="pdk" name="platform/external/libogg" path="external/libogg" revision="6a48629b7c7fc90326b2f959789828007b3cc184" upstream="master"/>
+  <project groups="pdk" name="platform/external/libopus" path="external/libopus" revision="a7703b70699299f078a189e19b6915120cded732" upstream="master"/>
+  <project groups="pdk" name="platform/external/libpcap" path="external/libpcap" revision="50a06a07f1dd408adf7607b76eaf02d0c254fe22" upstream="master"/>
+  <project groups="pdk" name="platform/external/libphonenumber" path="external/libphonenumber" revision="9313c2ce2fb61213e66adcf8ab4893a5d9c48da1" upstream="master"/>
+  <project groups="pdk" name="platform/external/libpng" path="external/libpng" revision="352e6a8ec05db372ccdfc80cb77de807d23e8432" upstream="master"/>
+  <project groups="pdk" name="platform/external/libunwind" path="external/libunwind" revision="76a0b9f6a9813311ddfd59aaa580339f36a2c510" upstream="master"/>
+  <project groups="pdk" name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="master"/>
+  <project groups="pdk" name="platform/external/libusb" path="external/libusb" revision="b81e632687e2380716ced43d28f7c95987959944" upstream="master"/>
+  <project groups="pdk" name="platform/external/libusb-compat" path="external/libusb-compat" revision="759481ae400d02fe99488dcdcd653b4f8139a39c" upstream="master"/>
+  <project groups="pdk" name="platform/external/libutf" path="external/libutf" revision="853ef375ba2ce430f5b13b556812b2d83ccc82e1" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvncserver" path="external/libvncserver" revision="d099c925eed901cedcb5f1b9079af45a3ca0e6b8" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvorbis" path="external/libvorbis" revision="dee2e0a12822ec62c89c2d7582f1a7d32cd0875b" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvpx" path="external/libvpx" revision="8585b768902331df85f7d1bbbc11bee4715da97a" upstream="master"/>
+  <project groups="pdk" name="platform/external/libvterm" path="external/libvterm" revision="f6cc826fe2eb9fc76fdf922d02ad86aecc5f1b18" upstream="master"/>
+  <project groups="pdk,libxml2" name="platform/external/libxml2" path="external/libxml2" revision="2975f91c5afcdc7c150e2db37430d958817270d0" upstream="master"/>
+  <project groups="pdk,libyuv" name="platform/external/libyuv" path="external/libyuv" revision="7a6bee2e5623dcc471f49a283144fed44dfb3757" upstream="master"/>
+  <project groups="vts,pdk" name="platform/external/linux-kselftest" path="external/linux-kselftest" revision="c33d1f8c4b98fa6aa24c67d484d31b58c0651933" upstream="master"/>
+  <project groups="pdk" name="platform/external/littlemock" path="external/littlemock" revision="105f5b4352a348a3628b081f4906f5dbb8c120f6" upstream="master"/>
+  <project groups="pdk" name="platform/external/lld" path="external/lld" revision="26c9bb3b51a7ac4bc45f73d532a03cfd9982043a" upstream="master"/>
+  <project groups="pdk" name="platform/external/llvm" path="external/llvm" revision="8cdd9f59ffb6bae793e50c7cfdb23e9eac0703c7" upstream="master"/>
+  <project groups="vts,pdk" name="platform/external/ltp" path="external/ltp" revision="5eca7e63c48f85c59486da4abd803b7ac9aed4b7" upstream="master"/>
+  <project groups="pdk" name="platform/external/lz4" path="external/lz4" revision="de7f627c7958b9847e0d9e6e29fcb566e3bb1dde" upstream="master"/>
+  <project groups="pdk" name="platform/external/lzma" path="external/lzma" revision="39a0299cfdac41a2631cfdb4bbb637ffa66170fd" upstream="master"/>
+  <project groups="pdk" name="platform/external/markdown" path="external/markdown" revision="06a8f8b914d477183f68b84424bce8ff4dae7e84" upstream="master"/>
+  <project groups="pdk" name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="e8c578035302f59c4e09f7170e18302261bc9e63" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/mesa3d" path="external/mesa3d" revision="e855ba79dee7a2d4df11d72752e1079cd5e58f2e" upstream="master"/>
+  <project groups="pdk" name="platform/external/messageformat" path="external/messageformat" revision="9e1e4dddc8aa0cae8279281488f8a6bf4f453192" upstream="master"/>
+  <project groups="pdk" name="platform/external/minijail" path="external/minijail" revision="fe5fb8ea506c1a198d690e712d848d149a0addd0" upstream="master"/>
+  <project groups="pdk" name="platform/external/mksh" path="external/mksh" revision="bba8f4a328807772fc16027133a9d63e9185fab5" upstream="master"/>
+  <project groups="pdk" name="platform/external/mmc-utils" path="external/mmc-utils" revision="6de31b2b8a09108f9b91bc12bee2b792f783dc62" upstream="master"/>
+  <project groups="pdk" name="platform/external/mockftpserver" path="external/mockftpserver" revision="777eb7d351810721b2416c4e48fe08e4ce0476f7" upstream="master"/>
+  <project groups="pdk" name="platform/external/mockito" path="external/mockito" revision="0211c64d5545015d76acda90d6013df67ec9124a" upstream="master"/>
+  <project groups="pdk" name="platform/external/mockwebserver" path="external/mockwebserver" revision="d680f43b995aae01123ee6bc7adb690dafcc47fe" upstream="master"/>
+  <project groups="pdk" name="platform/external/modp_b64" path="external/modp_b64" revision="68d0b5790fff5243aab59ae8108d7e69506ac4c4" upstream="master"/>
+  <project groups="pdk" name="platform/external/mp4parser" path="external/mp4parser" revision="88bd0c6cfa7fcfbbebcc15c2c565f714cb36b065" upstream="master"/>
+  <project groups="pdk" name="platform/external/mtpd" path="external/mtpd" revision="dfc7f34c62ee40f5ce47e0942021f96f62f937f7" upstream="master"/>
+  <project groups="pdk" name="platform/external/nanohttpd" path="external/nanohttpd" revision="c6783c32331b3fe78ffd5077e7f180995d0e268e" upstream="master"/>
+  <project groups="pdk" name="platform/external/nanopb-c" path="external/nanopb-c" revision="4b114fa241df177ec7fc36132d3bec20726c4f5f" upstream="master"/>
+  <project groups="pdk" name="platform/external/naver-fonts" path="external/naver-fonts" revision="91e6e9f94d1d769a8f742649674149ba98ce7d45" upstream="master"/>
+  <project groups="pdk" name="platform/external/netcat" path="external/netcat" revision="b023a43765b15f0b0fd5b52b7d8021f515c59c23" upstream="master"/>
+  <project groups="pdk" name="platform/external/netperf" path="external/netperf" revision="e100a0c4105b94f7044b243287a5da22f5e8e4e7" upstream="master"/>
+  <project groups="pdk" name="platform/external/neven" path="external/neven" revision="95e6c4663c640c67a69e1d2b44696753282136f8" upstream="master"/>
+  <project groups="pdk" name="platform/external/nfacct" path="external/nfacct" revision="3872c41d0bfb0dbe6c37ea5db5cc1e1d7a0d7971" upstream="master"/>
+  <project groups="pdk" name="platform/external/nist-pkits" path="external/nist-pkits" revision="e79665e3657171f55a979ca558ebe3c3dbf108d2" upstream="master"/>
+  <project groups="pdk" name="platform/external/nist-sip" path="external/nist-sip" revision="8445067c3b53e5bd56c32f1c4fb688083c4f4005" upstream="master"/>
+  <project groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" revision="60e126f1c096b20d4a3685e1de1147b6595e9012" upstream="master"/>
+  <project groups="pdk" name="platform/external/oauth" path="external/oauth" revision="49f3624a6d3307b640a012f15b94d04174473501" upstream="master"/>
+  <project groups="pdk" name="platform/external/objenesis" path="external/objenesis" revision="30c85e8178b11799cf08ad21339f52eaa787a13e" upstream="master"/>
+  <project groups="pdk" name="platform/external/okhttp" path="external/okhttp" revision="b53397b37a05fd50529810c726e7214cdc5b191e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/opencv" path="external/opencv" revision="6acb1f4a6e68f80b1cb0182f3d334dd8607697b5" upstream="master"/>
+  <project groups="pdk" name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer" revision="bbfb25464ff30c5a62dce351d719a8c533afb2a3" upstream="master"/>
+  <project groups="pdk" name="platform/external/parameter-framework" path="external/parameter-framework" revision="e210979b2eb1410f80fb88a9a4c235ee0cd23d0c" upstream="master"/>
+  <project groups="pdk" name="platform/external/pcre" path="external/pcre" revision="97f96c13a5b0c22e9827279eb0dd38e9c889f244" upstream="master"/>
+  <project groups="pdk" name="platform/external/pdfium" path="external/pdfium" revision="e4e9d1b6b387072f9071f896993a9cfe5481ab4c" upstream="master"/>
+  <project groups="pdk" name="platform/external/piex" path="external/piex" revision="ac5a3090cb5b5c2aaa7e1c68c9a68fc4f5a38c26" upstream="master"/>
+  <project groups="pdk" name="platform/external/ppp" path="external/ppp" revision="7e60466a0009f58aa09b60bf6dbb96cacd6cb829" upstream="master"/>
+  <project groups="pdk" name="platform/external/proguard" path="external/proguard" revision="af893cdc1242e4cfbeeb10e2323f9a689a825177" upstream="master"/>
+  <project groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f" upstream="master"/>
+  <project groups="pdk" name="platform/external/python/cpython2" path="external/python/cpython2" revision="181a615a16fd15caa50a2e6f729456e2c9d42e42" upstream="master"/>
+  <project groups="pdk" name="platform/external/python/cpython3" path="external/python/cpython3" revision="9458f8e38d4fe0d58890c5867485dbbf2d538955" upstream="master"/>
+  <project groups="pdk" name="platform/external/r8" path="external/r8" revision="730c831ebd6752bbe7c205a84b3f5e721ea2e443" upstream="master"/>
+  <project groups="pdk" name="platform/external/regex-re2" path="external/regex-re2" revision="79cce43a82abc1bc56c65de07a7df47d54e163a9" upstream="master"/>
+  <project groups="pdk" name="platform/external/replicaisland" path="external/replicaisland" revision="23e53aa67dc788cd2fe0598eaf7c9f20eb93c392" upstream="master"/>
+  <project groups="pdk" name="platform/external/rmi4utils" path="external/rmi4utils" revision="40eb2d785d3e367c01fc2a3d53820550e7f66739" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric" path="external/robolectric" revision="797e01c269d344b03f6080d46926c91603465949" upstream="master"/>
+  <project groups="pdk" name="platform/external/roboto-fonts" path="external/roboto-fonts" revision="25fa2dde3aacaeacb2797bcffddce96014f4fcc3" upstream="master"/>
+  <project groups="pdk" name="platform/external/rootdev" path="external/rootdev" revision="1dd6771e0f2e7da8736c9b21603817bce0d55ea9" upstream="master"/>
+  <project groups="pdk" name="platform/external/safe-iop" path="external/safe-iop" revision="cd76f998688d145235de78ecd5b340d0eac9239d" upstream="master"/>
+  <project groups="pdk" name="platform/external/scrypt" path="external/scrypt" revision="b7477d8eedb4aaf9ad5af921ea43bfe17103a23a" upstream="master"/>
+  <project name="platform/external/seccomp-tests" path="external/seccomp-tests" revision="e602290af558cee366ec98e366e0e8460c39534e" upstream="master"/>
+  <project groups="pdk" name="platform/external/selinux" path="external/selinux" revision="d72d78d96990b546bbf0b4a64c3b7320a54eabb9" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/sfntly" path="external/sfntly" revision="a217f56dac15a71326445fa7f6a789ec00b22392" upstream="master"/>
+  <project groups="pdk" name="platform/external/shflags" path="external/shflags" revision="c4876e01829b8cf110ee33267bb1bad1f8ebb51d" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/skia" path="external/skia" revision="740dcbc14f4bb497082890c1c4a85c0a993120a9" upstream="master"/>
+  <project groups="pdk" name="platform/external/sl4a" path="external/sl4a" revision="e83595a366433378e398273d5e25eba3817794eb" upstream="master"/>
+  <project groups="pdk" name="platform/external/slf4j" path="external/slf4j" revision="b4eb5f69f088f53ede0b7ee4a1a3bf2c3ff58418" upstream="master"/>
+  <project groups="pdk" name="platform/external/smali" path="external/smali" revision="78cf98bb8c439f99f06f7b609c5c533a9d41de68" upstream="master"/>
+  <project groups="pdk" name="platform/external/snakeyaml" path="external/snakeyaml" revision="03d1dd1553534e717fdff5f7bed00b67dbb23431" upstream="master"/>
+  <project groups="pdk" name="platform/external/sonic" path="external/sonic" revision="1163465de6c4b6c1816de74db60b28769cf5ac96" upstream="master"/>
+  <project groups="pdk" name="platform/external/sonivox" path="external/sonivox" revision="95ad2973de15846e1f67c5c5c30eae877afb2ca4" upstream="master"/>
+  <project groups="pdk" name="platform/external/speex" path="external/speex" revision="a7d909edd14636c8934e1b61cce563ef9d29c477" upstream="master"/>
+  <project name="platform/external/spirv-llvm" path="external/spirv-llvm" revision="9ebe91915ecc1ca31c074c92e4f11b7625801f18" upstream="master"/>
+  <project groups="pdk" name="platform/external/sqlite" path="external/sqlite" revision="39a32b46137c57b816e71d73438e4fac69b6b9d6" upstream="master"/>
+  <project groups="pdk" name="platform/external/squashfs-tools" path="external/squashfs-tools" revision="393e365802711fb6969858f79d80104399d140c0" upstream="master"/>
+  <project groups="pdk" name="platform/external/strace" path="external/strace" revision="5168b2b17e16c0ce1e5572080c46cb6ad4a2fecd" upstream="master"/>
+  <project groups="pdk" name="platform/external/svox" path="external/svox" revision="3279a68c2735ac1e1265ab2ecf5ee9c9afa076b3" upstream="master"/>
+  <project groups="pdk" name="platform/external/tagsoup" path="external/tagsoup" revision="9c02d9f506855965ec513685788890dfc856a5bc" upstream="master"/>
+  <project groups="pdk" name="platform/external/tcpdump" path="external/tcpdump" revision="1aa1e7ffca235f716b36c0a4588f84e23ea1be38" upstream="master"/>
+  <project groups="pdk" name="platform/external/testng" path="external/testng" revision="8f2e8231852f454b5903cf886be55e9f647cdd76" upstream="master"/>
+  <project groups="pdk" name="platform/external/timezonepicker-support" path="external/timezonepicker-support" revision="99e91a76fd74bad10266623d67cdb98d011f709e" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinyalsa" path="external/tinyalsa" revision="7c703a6b307ae7c3ba69429ed0c71417e507faff" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinycompress" path="external/tinycompress" revision="3d60feed720ce0ecf66196ca4846a55b3e6ee3c2" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinyxml" path="external/tinyxml" revision="ccc219c40a820afd30ad347c0e3d2bdbdf1df109" upstream="master"/>
+  <project groups="pdk" name="platform/external/tinyxml2" path="external/tinyxml2" revision="cf2bc196dcdac02efb415c4305180986411d73d0" upstream="master"/>
+  <project name="platform/external/toolchain-utils" path="external/toolchain-utils" revision="7091edfaa0ec531905b7d914e9307cd74caf02ea" upstream="master"/>
+  <project groups="pdk" name="platform/external/toybox" path="external/toybox" revision="3829236617fca43f854035a0608d16562a947e16" upstream="master"/>
+  <project groups="pdk" name="platform/external/tpm2" path="external/tpm2" revision="00f7bc755f76f483f6a59f917727339e089a9cc4" upstream="master"/>
+  <project groups="pdk" name="platform/external/tremolo" path="external/tremolo" revision="75c45ed3b5a684fb5bd3f09d64cd242adcda0752" upstream="master"/>
+  <project groups="pdk" name="platform/external/unicode" path="external/unicode" revision="680f240bda39c798480bef3bb36c671af1f575c1" upstream="master"/>
+  <project name="platform/external/universal-tween-engine" path="external/universal-tween-engine" revision="5a8be7ee6337367a1dcf11bdad865e7917519e46" upstream="master"/>
+  <project groups="pdk" name="platform/external/v8" path="external/v8" revision="7bde41a362a5746e44e9efc2ae8d1843f39d875e" upstream="master"/>
+  <project groups="pdk" name="platform/external/valgrind" path="external/valgrind" revision="84dd75ab14160e18d95f2f3ea6120c03ce8c429c" upstream="master"/>
+  <project groups="vboot,pdk-fs" name="platform/external/vboot_reference" path="external/vboot_reference" revision="0ad090ffa37b9a1e9a0063a4d4b808c6fe4809e2" upstream="master"/>
+  <project groups="pdk" name="platform/external/vixl" path="external/vixl" revision="2da09a48dc4d5a3c585f897f256c2c6c5fa4eb5a" upstream="master"/>
+  <project groups="pdk" name="platform/external/vogar" path="external/vogar" revision="7fa0640bfb29ae9593f2e07516f4a2925fd0c54a" upstream="master"/>
+  <project groups="pdk" name="platform/external/volley" path="external/volley" revision="3a1232594eb627e9e59b22406816648a55a3f2ae" upstream="master"/>
+  <project groups="pdk" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="4c40acb97e6df4a5895877f81cde4e9c0704a95f" upstream="master"/>
+  <project groups="pdk,qcom_msm8x26" name="platform/external/webp" path="external/webp" revision="e99d2e88295130a1874890b3b118969917de5a84" upstream="master"/>
+  <project groups="pdk" name="platform/external/webrtc" path="external/webrtc" revision="c07e6f5974151842a7a37a66aa7592761547287e" upstream="master"/>
+  <project groups="pdk" name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="14c5ecd85f3fd6a703a8bef710690246c8dd42bb" upstream="master"/>
+  <project groups="pdk" name="platform/external/wycheproof" path="external/wycheproof" revision="1187a7bf7b612a8c09b70e65ea52351a1c5c731b" upstream="master"/>
+  <project groups="pdk" name="platform/external/xmlrpcpp" path="external/xmlrpcpp" revision="1d7192fe0d2f788f8f150899c58b86c5ff10456a" upstream="master"/>
+  <project groups="pdk" name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5" upstream="master"/>
+  <project groups="pdk" name="platform/external/xmp_toolkit" path="external/xmp_toolkit" revision="42ea4dc6d1fc2206a7778029070ed9213e3b0fbf" upstream="master"/>
+  <project groups="pdk" name="platform/external/xz-embedded" path="external/xz-embedded" revision="03e7a3eae664d9ee1862b5f152310d17ae5c7428" upstream="master"/>
+  <project groups="pdk" name="platform/external/zlib" path="external/zlib" revision="30595680d975bf98dd62e3c25d16562ab33c3d4d" upstream="master"/>
+  <project groups="pdk" name="platform/external/zopfli" path="external/zopfli" revision="b36f966df9e7767a6b0aeb00fea29af0c57c89be" upstream="master"/>
+  <project groups="pdk" name="platform/external/zxing" path="external/zxing" revision="fedf8f2d8099bf7bb85dc3db8699343d56617deb" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/av" path="frameworks/av" revision="66688d8836830d742dd52dffabbf6c26bd16ad94" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" revision="b975c88178775cfacd2b9685f6286605c009cec7" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" revision="5950103a67264d36e0c5c65330604916e462714d" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" revision="829ab4b9b5a97eccc3f7662f8211e608a5db6ec0" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/compile/slang" path="frameworks/compile/slang" revision="46d3d78036e83b1c83504412afa212ed242feb13" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/data-binding" path="frameworks/data-binding" revision="15281a01df0a5892d818080f1df669bdb8a319f7" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ex" path="frameworks/ex" revision="d2ea93572bd276e4b5b9bd86887603a35f9a0f5b" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" revision="b9d30cfae90bd5584a8e7926ec6d938ce323e0fd" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/minikin" path="frameworks/minikin" revision="ec682a375dc8f39cd7c7dc91d65aec09d0ef4edb" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ml" path="frameworks/ml" revision="3d53a93c79beb608ca52f7e1ffbf2fc7d9c3722f" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/multidex" path="frameworks/multidex" revision="6450225f3eaf865b0838e84c4656f6dd6048d87b" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/native" path="frameworks/native" revision="2bb661ca09d87de9a47bd06145c42dfe99d51ca7" upstream="master"/>
+  <project groups="pdk-fs" name="platform/frameworks/opt/bitmap" path="frameworks/opt/bitmap" revision="a0d4e3108663202564a6833b76770075b8e5b767" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/bluetooth" path="frameworks/opt/bluetooth" revision="991e0444ed6edb1a77b0feae73c14e2a886cbf0d" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/calendar" path="frameworks/opt/calendar" revision="886d7d1277b82347c30ec5d79ba1576680947bb8" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/chips" path="frameworks/opt/chips" revision="02ced36ad1e062e79397296ebd1dc760870a4e42" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker" revision="c1d5eb2d31fb6a74ed129722754139c759aedbe8" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/datetimepicker" path="frameworks/opt/datetimepicker" revision="5348c906911a9ae65b165023e9e4ce45eee05c02" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="92eede13edbf22b501edb9aeb92366f91eab9781" upstream="master"/>
+  <project groups="pdk-fs" name="platform/frameworks/opt/inputconnectioncommon" path="frameworks/opt/inputconnectioncommon" revision="3baece9b20fa480da46d860acd7320fd9eee3386" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon" revision="990fcb1a6dbb5d1204cc8ec86e4bc3f691f4aeeb" upstream="master"/>
+  <project groups="pdk-fs" name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet" revision="264bef96c82961029702fcf8e12b0fddfa0d09ab" upstream="master"/>
+  <project groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" revision="ff0979256d1a67a62c726d6fe15264c496990605" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" revision="2e09c0ba8a11ee629a85582413598c60cca09e8e" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" revision="a4a7244fea03df223af726b0e8a4028593bd8e4b" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/photoviewer" path="frameworks/opt/photoviewer" revision="c0793686e13dafc2f45b0ad3e079f707938c6534" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/setupwizard" path="frameworks/opt/setupwizard" revision="2cce48fde424bd078f024d5ddc7c564ca1161e2f" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="bfc44f2e2ac6cb8e8ba51e4250a10401714bf198" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" revision="e344fd847c154f2d0680bf1089390326d634d847" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" revision="15d297d8ac4664e4a491448d9c15158ee51714f9" upstream="master"/>
+  <project groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" revision="56bb39fe6274b099522cff372dcab9482fc35e60" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" revision="684e045dc0efca4d5a8f0ed4b28036444ff9385f" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/webview" path="frameworks/webview" revision="35975286092f329186f66cf346eb6b0dff3c2e61" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="7bfc4444b48f1f046d50fc799a3bc64fc8e3c7df" upstream="master"/>
+  <project name="platform/hardware/akm" path="hardware/akm" revision="7889f98849ad3913586904e00d91b32cc0ceb75b" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="1ed4bedf4af755edc61bccb8f468a0df008dcf1f" upstream="master"/>
+  <project groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="052255ec30cf33e27bb0406cd5b3f9998325d6e4" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" revision="b75c9f3714cfae3dad3d976958e063150781437e" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/audio_media" path="hardware/intel/audio_media" revision="218f0d6bc9532d0b707ea325fd96998249fe47bf" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/bootstub" path="hardware/intel/bootstub" revision="c759e5127aa582ac515ee1446da15f601b15a99a" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/bd_prov" path="hardware/intel/common/bd_prov" revision="8af329f2d2b54dfcfa84051d3ce1fae95f79011a" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libmix" path="hardware/intel/common/libmix" revision="a644e4f384a7bd2afa4460da3a9f7951e9fa205e" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libstagefrighthw" path="hardware/intel/common/libstagefrighthw" revision="9d15c1c031fdf9cd4fa153e76245d7a5f8b82ed8" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libva" path="hardware/intel/common/libva" revision="feff90bd79e7152d06f4275c30209af2826ae8ba" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libwsbm" path="hardware/intel/common/libwsbm" revision="ac747113d4f6739b1462ca7fb40f2091691e209b" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/omx-components" path="hardware/intel/common/omx-components" revision="3db8bb9d44eef64553a88fdc2698ef3b593c49c7" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/utils" path="hardware/intel/common/utils" revision="6b9b06d89fd0e01037d3138c71886f2c315ae9ee" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/common/wrs_omxil_core" path="hardware/intel/common/wrs_omxil_core" revision="760b9713c84566e6a3a39d114d346d20389f47a8" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/img/hwcomposer" path="hardware/intel/img/hwcomposer" revision="8c2ae7ccfd78fb4efaf4c0c61a697f2075584934" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/img/psb_headers" path="hardware/intel/img/psb_headers" revision="aed9716b5467e75728f761ac75a4ba5ca3c51ea0" upstream="master"/>
+  <project groups="intel,pdk" name="platform/hardware/intel/img/psb_video" path="hardware/intel/img/psb_video" revision="7407927b0eda431b7d817cb9d78189f335f509b1" upstream="master"/>
+  <project groups="intel_sensors,pdk" name="platform/hardware/intel/sensors" path="hardware/intel/sensors" revision="68dc9e70b79dacddc4e0bf00af0de7f764b04eed" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" revision="1bbe51d0b5bef615692afe6ccc24259c1b2208e4" upstream="master"/>
+  <project groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" revision="11e5ff75af866f91622b6008fa13db1c3685ae69" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" revision="f12e85e1d3aa640922686d9c4cab992684812535" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="483a68f68a3f7f115f8909d663e93edaf89762f5" upstream="master"/>
+  <project groups="marvell_bt,pdk" name="platform/hardware/marvell/bt" path="hardware/marvell/bt" revision="3f33d194e8300816b94d1d7b68b1d48c8f903251" upstream="master"/>
+  <project groups="qcom,qcom_audio,pdk" name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="ba9bce36176b05695bd042acadc4a254ab911872" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/qcom/bootctrl" path="hardware/qcom/bootctrl" revision="6007fe6af3f7eb0c6b5fc3cab3c0f0cf5a7b50fe" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/bt" path="hardware/qcom/bt" revision="5e2825785169ae647e80ce48ac814abe2ca57532" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="383b6cb93b5952c2a87b3ea5ce2be50f006dd395" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/data/ipacfg-mgr" path="hardware/qcom/data/ipacfg-mgr" revision="cc379d116231083e1b804fea9b0ef52d9e105ae1" upstream="master"/>
+  <project groups="pdk,qcom,qcom_display" name="platform/hardware/qcom/display" path="hardware/qcom/display" revision="42ea1de6807fa5885f18cbd6c5fd96f80395fcea" upstream="master"/>
+  <project groups="qcom,qcom_gps,pdk" name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="45c0574442a01c2f6a9ccb2044b6f30c7ad288e4" upstream="master"/>
+  <project groups="qcom,qcom_keymaster,pdk" name="platform/hardware/qcom/keymaster" path="hardware/qcom/keymaster" revision="29565ce1f9219e66b7fb40063d49d14bb84ba606" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="63abe022daf627edac121f5c389d7f660db547ac" upstream="master"/>
+  <project groups="qcom_msm8960,pdk" name="platform/hardware/qcom/msm8960" path="hardware/qcom/msm8960" revision="c25a431842a26b5756b58a9d4a42c776e0457ba2" upstream="master"/>
+  <project groups="qcom_msm8994,pdk" name="platform/hardware/qcom/msm8994" path="hardware/qcom/msm8994" revision="60aaa00b2e0d537c0f51631dd88d919fc1baf439" upstream="master"/>
+  <project groups="qcom_msm8996" name="platform/hardware/qcom/msm8996" path="hardware/qcom/msm8996" revision="c552e34d90d0ff2b69660943c2060f17b5d59eb9" upstream="master"/>
+  <project groups="qcom_msm8x26,pdk" name="platform/hardware/qcom/msm8x26" path="hardware/qcom/msm8x26" revision="5c60d76743ed98e7082b7f72927c17a7b86e0218" upstream="master"/>
+  <project groups="qcom_msm8x27,pdk" name="platform/hardware/qcom/msm8x27" path="hardware/qcom/msm8x27" revision="8ff5c0057cbdecfa09410c1710ba043e191a2862" upstream="master"/>
+  <project groups="qcom_msm8x84,pdk" name="platform/hardware/qcom/msm8x84" path="hardware/qcom/msm8x84" revision="582b414269d8472d17eef65d8a8965aa8105042f" upstream="master"/>
+  <project groups="qcom,pdk" name="platform/hardware/qcom/power" path="hardware/qcom/power" revision="3a098ee1f89c398b9d6e7b5dfae9c694994f8bc4" upstream="master"/>
+  <project groups="qcom_wlan,pdk" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="ec9deb6e65d7c7816083d925255bbaefe16e4778" upstream="master"/>
+  <project groups="pdk" name="platform/hardware/ril" path="hardware/ril" revision="d5461a4f08750fbaa1be66d7db9068f6fa064953" upstream="master"/>
+  <project groups="pdk" name="platform/libcore" path="libcore" revision="702f599857e13697805ba8477437038f87a27206" upstream="master"/>
+  <project groups="pdk" name="platform/libnativehelper" path="libnativehelper" revision="d0865381b9f1989fc059bb8ae4c31519b56b1b5a" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" revision="0aa0611f9c6775575da56a1746fef1cf68267b0e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="4cafef3a64082be8f38bfa4e59ea619c5483acdf" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" revision="ffc5f72f39de7f9bc956ab29d087596d0f55ef70" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="e1bda28f1545111ba7734577f23e194bf3db3f5f" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="2bbf7b8414ebcff2207b08224d8913241a766a5a" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" revision="d396acf862f82209cd5d770a3f03fc95d3b7326b" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" revision="46d5820744888866cab227b38eaae21b6f93a39a" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="c52467b4e38ab74b233ea132b3212a9d17af0785" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="7562fee50a9db5afa94786f1d3acb1f0452e3ea7" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="41e553f6ec13e860694a2790cea82a4300b6703e" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/ContactsCommon" path="packages/apps/ContactsCommon" revision="c59284acd9283f2274fc18fe69ea9d08cf1245d4" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="b89bbe70df270c344123d7ce2bcecf1a84c399f1" upstream="master"/>
+  <project groups="pdk" name="platform/packages/apps/DevCamera" path="packages/apps/DevCamera" revision="85b25ee8ce0c5d19b53963c985869100282b55d1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Dialer" path="packages/apps/Dialer" revision="8e49b42b6fde177fb242da12bb05365ef03362e1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Email" path="packages/apps/Email" revision="1239cd59a0f4dfd0a96e1a83b8871bd2b18358c6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo" revision="b7282555b3b99fc9aa98b6c807662fa096c80e3c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/ExactCalculator" path="packages/apps/ExactCalculator" revision="7c359e389457d7cb7cd4f696608355beb3fa13f0" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ae5a3067f51cee6cfeec73d56815892bb3f6c4de" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" revision="5ffe93060777b92f221adbd0ddc67b9479852d80" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f19c4a10890cafb17ceaf68cda835dc24aad455c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" revision="64b7df195d2bfdcc41579e9ef5f3b49afde18116" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="44c1afdc7fe9f4420933ad0c9fd824931179ca27" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" revision="a80a70f2f8c5e32e7b1ec6c78c4f7c3b3500102e" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" revision="d166148abab4af9111e325a859f86d58e2a04c0b" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" revision="2a68a11b2c9156f9f9747fe0b974d0baca157706" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Messaging" path="packages/apps/Messaging" revision="7b2c6ed6a50b10b698f0b0251ac3a9b532432d72" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Music" path="packages/apps/Music" revision="75df705a0f4e7f36050ea68fa8695325f2a691d8" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" revision="035fa0123d87b48554cbd294ee9681b25eb7049b" upstream="master"/>
+  <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="7b94e08d3fbdcfe83ec108d581355b6b0b8c5978" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" revision="01e429c08e51291315890de9677151a7e0b6ad35" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="0d467d56ce68a1bc26d721a5c3b9a6caf98aadb4" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="79731f02b7009206a01182d2cca15dfc8491da09" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" revision="f962ad993640d79dc1d76494650cf6d3e83ee6de" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="d686dc74168ed5324b2388133531f30255659ae6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="077fc59dd26cdecdfe2ea3af614291b103faa7e2" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="b17f4ddf6719faef79535c76ea6af84f5009d4a1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/RetailDemo" path="packages/apps/RetailDemo" revision="66244a5c528afb29b1a88aa788770063b91c89b2" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" revision="1e01c3e1bcc0ed83b3676e1d5c0b75d5ed873391" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="31a2f413f86c9ad2b7150e5b379d408cac5e7645" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="5f67a8eaea9379d7fce53db77e9ed7b47e49f1e1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SpareParts" path="packages/apps/SpareParts" revision="4db997871e3f4c3f84660815096e5276b47c5c91" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="51cc8462c082a26810f5d7c5a2648232a77e795c" upstream="master"/>
+  <project groups="apps_stk,pdk-fs" name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="c06b7815817fe7682c858cbe10494f671dd6bbd3" upstream="master"/>
+  <project name="platform/packages/apps/StorageManager" path="packages/apps/StorageManager" revision="a1c249013e65ec1fc38076cc29830c4367c8cace" upstream="master"/>
+  <project name="platform/packages/apps/TV" path="packages/apps/TV" revision="7416628255cd3c95b6ffecd331fbb0add9c1eea9" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="60102ca02f1a93af59cc479f2a80a40a382d668c" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Terminal" path="packages/apps/Terminal" revision="e71d9d40b5b66d646f80081abea9893d3e0fdf59" upstream="master"/>
+  <project groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" revision="0fba4364b09c47766046e5afb12fd3304273323f" upstream="master"/>
+  <project groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" revision="f68ad8c913885a597dc41da70cbdc23477fe85a6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" revision="9648d6bc0a106576927264ab580e1a326fba920a" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail" revision="a3efe60e6b9e0045eef5f88491bc966868357300" upstream="master"/>
+  <project name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" revision="969934f908ff2ddda77bddbb80f206daf6a24281" upstream="master"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="e24ee92653e28ddf0020ffb9e5ddc99931117674" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="bde4c9a8dfa85ca71f034c371908358bf61a74f2" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="59aefa242169b7a51c2381daee58ff22fd1834ce" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="33d26f5eedb3d3011762ce5b2de66e931bf64b35" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider" revision="3aef9aef553a126b57fa9d7c271bf82abdb8ca9f" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/BookmarkProvider" path="packages/providers/BookmarkProvider" revision="3fa85d57a81d2cdfd08465d3dcb5e7ad4ad1f7ca" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="8da754fcd166e11363e4d031b0c42f2abe92238d" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/CallLogProvider" path="packages/providers/CallLogProvider" revision="8d79e5e0f0673f20aff55fdb6ccb297bdc509387" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="44c11b854e615a007eda9760f9c9d0323c9c73ba" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="ef033b3587853368d947c4d849eb5d6818cc612a" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="654f73a379a36e5f4cdb2fc4cdfbc06971bff212" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/PartnerBookmarksProvider" path="packages/providers/PartnerBookmarksProvider" revision="133b4fb575d32b7e2e887e2d1d6a9e6877b54440" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="22a5cfb7b166ad972c73d171a078a0932587bd44" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/providers/TvProvider" path="packages/providers/TvProvider" revision="374df0a9f8c1b92b1bdb7572f30543188c8c7a1c" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="12907529afb603d10bc133e808728cef12e5dad6" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic" revision="e72ef139782ca896dced7524abe7cfcc9ed35db1" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable" revision="a9c5d50340fcef49034add6766576e4aab7d1168" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/screensavers/WebView" path="packages/screensavers/WebView" revision="6e0a80f6faed6191acc8ce1b6c79eada09e9e042" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" revision="5bd17d4644dccb6cd5e23c95490ea925082d42d3" upstream="master"/>
+  <project groups="adp8064,pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" revision="f9cfa43094ac3111c92283a0ce9db8e377ac47ab" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" revision="dfa0e3116b3ba72b9c2f308d8d11bc6ced6ad23b" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation" revision="87a0ebe5a071130fbb5d5117806964f4e8bc1a77" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" revision="d733a73a8d8362f24b8aa7a4073b74736203069e" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" revision="4cd944d4b011c73cea1b126433e3ff3fe6e1aee0" upstream="master"/>
+  <project groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="313c31a2d7ff12d4f78d11458d8b268a5fe97d9c" upstream="master"/>
+  <project groups="pdk" name="platform/pdk" path="pdk" revision="708589163e790eb3a7fec09f4832a0f78999bdf3" upstream="master"/>
+  <project groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" revision="f831a34488fa3e6806bee32d7a85820a5645a428" upstream="master"/>
+  <project clone-depth="1" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" revision="f36d67e0b8fa645428c4ebf6f05c2974bc8337d9" upstream="master"/>
+  <project clone-depth="1" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" revision="83a0ec4746ab945004a9e71f2253d5fed8a4cc75" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" revision="3a47dbd8cf86afe7f72d48902a342a7894d9570a" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="f537089a258a89539154e8f3932f4c8bd1bdde30" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="5bebe70905a43b398bdb04a678bf6d50a2c4452e" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="97aa4a3b378ec49271f264cc41b79be3cf04d06e" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="cf90e197dcf00a26d0c1fc9192a3388001b816a3" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" revision="fb36c717664a98b82eecec4122431769c33489d3" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" revision="0c7d72c96f0e9c2b7cd8d4f33875f6424ab937e6" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/eclipse" path="prebuilts/eclipse" revision="7985a1e57e906ce50505fe37769773983cb2eb40" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="03e2ae15852449ae81ddaa54c35739af27180581" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="d8c414fc49e933c074f173e6d87795cc7fdcfedc" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="c3b7a175640fc59711614c0ad5269a037e06fe7a" upstream="master"/>
+  <project clone-depth="1" groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="e8a2f21c1cc7f87069da71bc2f1901acc4ea2bdf" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="ce9d77505072450d2f16a4bf06673f31d8d67ff0" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="ea9c88beb9ffbb1a0833cc3ee94b53950729473d" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="ed4f6b503e1d7f2bc03d87b90084e12e33f8be4f" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="73ca99196723f810dad42390d154654354f57c16" upstream="master"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="d3566f4f19b660d98ff237825ed775289c102420" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="a332df8dadd78866c2a57f2c7348d499952939c2" upstream="master"/>
+  <project clone-depth="1" groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="1944f44167a907969de5138fe4cc442432b7cc37" upstream="master"/>
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" revision="4a696dd19df2fee0ce24f5bdbd8ae0e03049f97b" upstream="master"/>
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" revision="172e21a7c836e6086c6faae7b080a38c779597ac" upstream="master"/>
+  <project clone-depth="1" groups="darwin,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="3a0d506bad18e41d9cbffd196c24d70d0c40d0ab" upstream="master"/>
+  <project clone-depth="1" groups="linux,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="3377874f67bcc7d200408ceb8b02169c4c3b201d" upstream="master"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" revision="ba09d77a59458527e92a4ee12bfdf0d7ac4ae6e2" upstream="master"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/libs/libedit" path="prebuilts/libs/libedit" revision="d32685dba4011664b590b94ad156bc734c2c9bb5" upstream="master"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" revision="e1ca35066d5b3ef63b188a3ffe8cb058feb9b83e" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" revision="3e120da701eb2dd7da9c986cbb11ff850805c252" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="2b88f8ee10044fe4b77a35c9587759d992561af2" upstream="master"/>
+  <project clone-depth="1" groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master"/>
+  <project clone-depth="1" groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="7bd52e8c08951d11ae4437e407c62566a1c3416d" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="895ce3d698d930484c18f97237699a4f5d2d6929" upstream="master"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="d36c987371321aa7ae38703810b4ea14945533e1" upstream="master"/>
+  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="3aca8cce121d427bc5cba6c355bfbfcd453a9395" upstream="master"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" revision="7fcb50b6f76f57eaf5fecbb6b5a0cafcfdf95500" upstream="master"/>
+  <project groups="pdk" name="platform/system/bt" path="system/bt" revision="ca6aea976d5e38e6cc9c22247812ac7deb58ea57" upstream="master"/>
+  <project groups="pdk" name="platform/system/ca-certificates" path="system/ca-certificates" revision="e312bd5044fc07e85b8b0c21b8f21a9329ce9636" upstream="master"/>
+  <project name="platform/system/connectivity/wificond" path="system/connectivity/wificond" revision="483bd8dcfd508095113cfde82e8b79ce6e29759f" upstream="master"/>
+  <project name="platform/system/connectivity/wifilogd" path="system/connectivity/wifilogd" revision="796315a7e25212d6dc3a998405e25bc877d57cc8" upstream="master"/>
+  <project groups="pdk" name="platform/system/core" path="system/core" revision="eb42bb8c8ba93b092e50e5426a07c692fa76d8b2" upstream="master"/>
+  <project groups="pdk" name="platform/system/extras" path="system/extras" revision="3cd4b5a765e824f0eb2441a51cd97d4a90f17127" upstream="master"/>
+  <project groups="pdk" name="platform/system/gatekeeper" path="system/gatekeeper" revision="c530d631aa9db4522f8b3e6879cf2280a1a1c903" upstream="master"/>
+  <project groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" revision="13e5d8a98e919e5638f681f38550eddcaf890937" upstream="master"/>
+  <project groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" revision="dcb3db439c1535a52c796a489e8a6087039e5a46" upstream="master"/>
+  <project groups="pdk" name="platform/system/keymaster" path="system/keymaster" revision="2a28077463ccde87fa0662eca097b1f58013c147" upstream="master"/>
+  <project name="platform/system/libfmq" path="system/libfmq" revision="fbfa0c6d654118ee34239b4d1b2d08a245353d70" upstream="master"/>
+  <project name="platform/system/libhidl" path="system/libhidl" revision="aea9f83e6d95a15de668716c627093b17c6bc229" upstream="master"/>
+  <project groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" revision="f234318905c87c80eaeb1546bafe9d8de55cf56f" upstream="master"/>
+  <project groups="pdk" name="platform/system/libufdt" path="system/libufdt" revision="ea5d3f72aa01de436f8e1e5bcdd7748d255285ad" upstream="master"/>
+  <project groups="pdk" name="platform/system/libvintf" path="system/libvintf" revision="bbfff3032efa6fccd6a4d975980ef8922f2c81d7" upstream="master"/>
+  <project groups="pdk" name="platform/system/media" path="system/media" revision="e338b979f9ff2d869691bfab1eb098b5f426c664" upstream="master"/>
+  <project groups="pdk" name="platform/system/netd" path="system/netd" revision="54c4105adbf78a29d67a13786f0ab43203412059" upstream="master"/>
+  <project groups="pdk" name="platform/system/nfc" path="system/nfc" revision="bdb53f8487bf83e36666f5cbe247d7156a057bfa" upstream="master"/>
+  <project name="platform/system/nvram" path="system/nvram" revision="48087181f977c4f75c81705361f455f5ee9c7c37" upstream="master"/>
+  <project groups="pdk" name="platform/system/security" path="system/security" revision="975e1aae69f9bcdb35de5b2b8f466514f5fe4ba2" upstream="master"/>
+  <project groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" revision="a92d3135619f83098600c65df62665c448497ee8" upstream="master"/>
+  <project groups="pdk" name="platform/system/timezone" path="system/timezone" revision="77a2eb768c17298c79b5d594e7669a92b88f7fef" upstream="master"/>
+  <project groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" revision="babca26b0faa5e41ced0b39cb135fb181a81fa1a" upstream="master"/>
+  <project groups="pdk" name="platform/system/tools/hidl" path="system/tools/hidl" revision="a1b227c5551b207793cfc2f7c0803c791a853c51" upstream="master"/>
+  <project name="platform/system/tpm" path="system/tpm" revision="dd2735f149fe58555efa004e330a49ee71954d3f" upstream="master"/>
+  <project groups="pdk" name="platform/system/update_engine" path="system/update_engine" revision="929461ab11769339108658f2022d068446ca90f7" upstream="master"/>
+  <project groups="pdk" name="platform/system/vold" path="system/vold" revision="4ad7784b07c476800dcbad1e9a749e02812b2d9e" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" revision="02ce6b6c477e72daeebd9122531b397a8c102c04" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" revision="30d457ce6613d587901379844b9d0dfb37a67a7b" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" revision="0a064803e1ebbfd5e587e9baf677d458a4e3bbd8" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts" path="test/vts" revision="f799c3ff22301ee29b3feb949322e5951aba9d92" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/fuzz" path="test/vts-testcase/fuzz" revision="6af0bde5881d2ab0366bf9479f151e5f3bbc32b6" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" revision="319ccd4df317c426f790a9117a57f892ff715501" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/hal-trace" path="test/vts-testcase/hal-trace" revision="a0a4488258c74bb0c61a71b3c4c4aacfd4ed210d" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" revision="2dbc05a69a87109b04ba9462bf39d2209202d0b0" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/performance" path="test/vts-testcase/performance" revision="04538ffdca38754da367d51ed825999727654654" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" revision="3c8938ec3c75b4b6a4649a22d3478822ac2dedd7" upstream="master"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" revision="b2b66733c0b5717736d96945e02ee2926583cc5b" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" revision="0e3881fa383ee9edee07074d06dcdf7cdaa69832" upstream="master"/>
+  <project groups="tools" name="platform/tools/external/fat32lib" path="tools/external/fat32lib" revision="70067d87eb7b1cf6eb84a5c3d476225898177eba" upstream="master"/>
+  <project groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" revision="bd3466bb3119802994f2d149bab648af567335a2" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" revision="53720799c7f266384c3d2cb032082a94f0730cae" upstream="master"/>
+  <project groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="4c4e78c4d9b52a1a5c5ed11c39ab36d258037a2c" upstream="master"/>
+  <project groups="pdk" name="platform/tools/test/connectivity" path="tools/test/connectivity" revision="42411489d74dbc097cc5353bbab82bbab29cbac5" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" revision="7100660d5379dc3fd8124daa3bdeb4c92d041b35" upstream="master"/>
+  <project groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" revision="520eaa2ec95619705f8574c1b7e47e4fea28b654" upstream="master"/>
+  <project name="toolchain/binutils" revision="1661a29f471199a57719ff27eed5af7d7714376e" upstream="master"/>
+  
+  <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks"/>
+</manifest>
diff --git a/tools/linux/art.tar.gz.sha1 b/tools/linux/art.tar.gz.sha1
index 3ad91fc..69bed97 100644
--- a/tools/linux/art.tar.gz.sha1
+++ b/tools/linux/art.tar.gz.sha1
@@ -1 +1 @@
-d82de0af429ec884d487efa2d4b41f4b522c9ecd
\ No newline at end of file
+b33de67ccd4235ae3e5a6a5d12049863bd97a421
\ No newline at end of file