From e6a6b6d09d0871ff436a02a40f99e5cb8b8f5ad8 Mon Sep 17 00:00:00 2001
From: Axel Fagerstedt <axel.fagerstedt@linaro.org>
Date: Wed, 9 Jan 2013 14:33:59 +0100
Subject: rebase

---
 tracking.xml | 697 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 349 insertions(+), 348 deletions(-)

diff --git a/tracking.xml b/tracking.xml
index fc945be..b53897a 100644
--- a/tracking.xml
+++ b/tracking.xml
@@ -15,49 +15,48 @@
            sync-j="4" />
 
   <!-- External extras -->
-  <project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" groups="common"/>
-  <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" groups="common"/>
-  <project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" groups="common"/>
+  <project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" groups="common" />
+  <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" groups="common" />
+  <project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" groups="common" />
 
   <!-- Linaro extras -->
-  <project path="packages/apps/DisableSuspend" name="platform/packages/apps/DisableSuspend" revision="master" groups="common"/>
-  <project path="hardware/samsung/origen/gralloc_ump" name="platform/hardware/samsung/origen/gralloc_ump" revision="linaro_android_jb" groups="common"/>
-  <project path="hardware/samsung/origen/ump" name="platform/hardware/samsung/origen/ump" revision="linaro_android_jb" groups="common"/>
-  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_jb" groups="common"/>
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro-jb" groups="common"/>
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro-jb" groups="common"/>
-  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-jb" groups="common"/>
-  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro-jb" groups="common"/>
-  <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro-jb" groups="common"/>
-  <project path="hardware/linaro/tinyhal" name="platform/hardware/linaro/tinyhal" revision="linaro-jellybean" groups="common"/>
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.19" groups="common"/>
-  <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" groups="common"/>
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" groups="common"/>
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.11.1" groups="common"/>
-  <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" groups="common"/>
-  <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" groups="common"/>
-  <project path="u-boot/linaro/origen" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other" groups="origen"/>
-  <project path="u-boot/linaro/vexpress" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" groups="vexpress"/>
-  <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="vexpress"/>
-  <project path="boot-wrapper" name="arm/models/boot-wrapper" revision="master" remote="linaro-other" groups="vexpress"/>
-  <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" groups="common"/>
-  <project path="external/pm-qa" name="tools/pm-qa" revision="master" remote="linaro-other" groups="common"/>
-  <project path="external/tools_for_pm-qa" name="people/kejunzhou/tools_for_pm-qa" remote="linaro-other" revision="master" groups="common"/>
-  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" groups="common"/>
-  <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common"/>
-  <project path="external/libnl" name="platform/external/libnl" revision="linaro" groups="common"/>
-  <project path="external/iozone" name="platform/external/iozone" revision="linaro_android" groups="common"/>
-  <project path="external/memtester" name="platform/external/memtester" revision="linaro_android" groups="common"/>
-  <project path="external/stress" name="platform/external/stress" revision="linaro_android" groups="common"/>
-  <project path="external/stressapptest" name="platform/external/stressapptest" revision="linaro_android" groups="common"/>
-  <project path="external/htop" name="platform/external/htop" revision="linaro_android" groups="common"/>
-  <project path="external/stringbench" name="platform/external/stringbench" revision="master" groups="common"/>
+  <project path="packages/apps/DisableSuspend" name="platform/packages/apps/DisableSuspend" revision="master" groups="common" />
+  <project path="hardware/samsung/origen/gralloc_ump" name="platform/hardware/samsung/origen/gralloc_ump" revision="linaro_android_jb" groups="common" />
+  <project path="hardware/samsung/origen/ump" name="platform/hardware/samsung/origen/ump" revision="linaro_android_jb" groups="common" />
+  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_jb" groups="common" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro-jb" groups="common" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro-jb" groups="common" />
+  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-jb" groups="common" />
+  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro-jb" groups="common" />
+  <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro-jb" groups="common" />
+  <project path="hardware/linaro/tinyhal" name="platform/hardware/linaro/tinyhal" revision="linaro-jellybean" groups="common" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.19" groups="common" />
+  <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" groups="common" />
+  <project path="external/x264" name="platform/external/x264" revision="linaro-master" groups="common" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.0.1" groups="common" />
+  <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" groups="common" />
+  <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" groups="common" />
+  <project path="u-boot/linaro/origen" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other" groups="origen" />
+  <project path="u-boot/linaro/vexpress" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" groups="vexpress" />
+  <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="vexpress" />
+  <project path="boot-wrapper" name="arm/models/boot-wrapper" revision="master" remote="linaro-other" groups="vexpress" />
+
+  <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" groups="common" />
+  <project path="external/pm-qa" name="tools/pm-qa" revision="master" remote="linaro-other" groups="common" />
+  <project path="external/tools_for_pm-qa" name="people/kejunzhou/tools_for_pm-qa" remote="linaro-other" revision="master" groups="common" />
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro-2012.12" remote="linaro-other" groups="common" />
+  <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" />
+  <project path="external/libnl" name="platform/external/libnl" revision="linaro" groups="common" />
+  <project path="external/iozone" name="platform/external/iozone" revision="linaro_android" groups="common" />
+  <project path="external/memtester" name="platform/external/memtester" revision="linaro_android" groups="common" />
+  <project path="external/stress" name="platform/external/stress" revision="linaro_android" groups="common" />
+  <project path="external/stressapptest" name="platform/external/stressapptest" revision="linaro_android" groups="common" />
+  <project path="external/htop" name="platform/external/htop" revision="linaro_android" groups="common" />
+  <project path="external/stringbench" name="platform/external/stringbench" revision="master" groups="common" />
   <!-- Make sure only one of the kernels is enabled! -->
   <!-- Linaro kernel -->
-  <project path="kernel" name="people/bhoj/samsung/kernel" remote="linaro-other" revision="android-tracking" groups="origen"/>
-<!--
-  <project path="kernel/linaro/vexpress" name="kernel/linux-linaro-tracking" remote="linaro-other" revision="linux-linaro" groups="vexpress"/>
--->
+  <project path="kernel/linaro/origen" name="people/bhoj/samsung/kernel" remote="linaro-other" revision="android-tracking" groups="origen" />
+  <project path="kernel/linaro/vexpress" name="kernel/linux-linaro-tracking" remote="linaro-other" revision="linux-linaro" groups="vexpress" />
   <!-- AOSP kernel -->
   <!-- project path="kernel" name="kernel/omap" revision="android-omap-panda-3.0" -->
     <!-- We copy the defconfig over so we can use the same name as w/ the Linaro kernel -->
@@ -66,350 +65,352 @@
 
   <!-- AOSP with Linaro additions -->
   <!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
-  <project path="build" name="platform/build" revision="linaro_android_4.2.1" groups="common">
+  <project path="build" name="platform/build" revision="linaro_android_4.2.1" groups="common" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
   <!-- Linaro modifications: gcc 4.6+ -Werror support -->
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" groups="common" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
-  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
-  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" groups="common" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" groups="common"/>
+  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" groups="common" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" groups="common" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" groups="common" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="development" name="platform/development" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" groups="common" />
+  <project path="development" name="platform/development" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" groups="common" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/tremolo" name="platform/external/tremolo" groups="common"/>
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/tremolo" name="platform/external/tremolo" groups="common" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="cts" name="platform/cts" groups="common"/>
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="system/media" name="platform/system/media" groups="common"/>
-  <project path="external/strace" name="platform/external/strace" groups="common"/>
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" groups="common" />
+  <project path="cts" name="platform/cts" groups="common" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" groups="common" />
+  <project path="system/media" name="platform/system/media" groups="common" />
+  <project path="external/strace" name="platform/external/strace" groups="common" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" groups="common"/>
-  <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" groups="common"/>
-  <project path="external/libvpx" name="platform/external/libvpx" groups="common"/>
-  <project path="external/gtest" name="platform/external/gtest" groups="common"/>
-  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master" groups="common"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" groups="common" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" groups="common" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" groups="common" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" groups="common" />
+  <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" groups="common" />
+  <project path="external/libvpx" name="platform/external/libvpx" groups="common" />
+  <project path="external/gtest" name="platform/external/gtest" groups="common" />
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master" groups="common" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" groups="common"/>
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" groups="common"/>
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" groups="common" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" groups="common" />
 
   <!-- TI proprietary-open -->
-  <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" groups="common"/>
-  <project path="device/ti/uim" name="device/ti/uim" revision="android" groups="common"/>
+  <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" groups="common" />
+  <project path="device/ti/uim" name="device/ti/uim" revision="android" groups="common" />
 
   <!-- AOSP -->
-  <project path="abi/cpp" name="platform/abi/cpp" groups="common"/>
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="common"/>
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" groups="common"/>
-  <project path="bootable/recovery" name="platform/bootable/recovery" groups="common"/>
-  <project path="device/asus/grouper" name="device/asus/grouper" groups="common"/>
-  <project path="device/common" name="device/common" groups="common"/>
-  <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="common"/>
-  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="common"/>
-  <project path="device/generic/common" name="device/generic/common" groups="common"/>
-  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="common"/>
-  <project path="device/generic/mips" name="device/generic/mips" groups="common"/>
-  <project path="device/generic/x86" name="device/generic/x86" groups="common"/>
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device,common"/>
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,common"/>
-  <project path="device/sample" name="device/sample" groups="common"/>
-  <project path="device/samsung/toro" name="device/samsung/toro" groups="common"/>
-  <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="common"/>
-  <project path="external/aac" name="platform/external/aac" groups="common"/>
-  <project path="external/android-clat" name="platform/external/android-clat" groups="common"/>
-  <project path="external/android-mock" name="platform/external/android-mock" groups="common"/>
-  <project path="external/ant-glob" name="platform/external/ant-glob" groups="common"/>
-  <project path="external/antlr" name="platform/external/antlr" groups="common"/>
-  <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="common"/>
-  <project path="external/apache-http" name="platform/external/apache-http" groups="common"/>
-  <project path="external/apache-qp" name="platform/external/apache-qp" groups="common"/>
-  <project path="external/apache-xml" name="platform/external/apache-xml" groups="common"/>
-  <project path="external/arduino" name="platform/external/arduino" groups="common"/>
-  <project path="external/astl" name="platform/external/astl" groups="common"/>
-  <project path="external/bison" name="platform/external/bison" groups="common"/>
-  <project path="external/blktrace" name="platform/external/blktrace" groups="common"/>
-  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="common"/>
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="common"/>
-  <project path="external/bsdiff" name="platform/external/bsdiff" groups="common"/>
-  <project path="external/bzip2" name="platform/external/bzip2" groups="common"/>
-  <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="common"/>
-  <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="common"/>
-  <project path="external/cibu-fonts" name="platform/external/cibu-fonts" groups="common"/>
-  <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="common"/>
-  <project path="external/dbus" name="platform/external/dbus" groups="common"/>
-  <project path="external/dexmaker" name="platform/external/dexmaker" groups="common"/>
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" groups="common"/>
-  <project path="external/doclava" name="platform/external/doclava" groups="common"/>
-  <project path="external/dropbear" name="platform/external/dropbear" groups="common"/>
-  <project path="external/easymock" name="platform/external/easymock" groups="common"/>
-  <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" groups="common"/>
-  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" groups="common"/>
-  <project path="external/emma" name="platform/external/emma" groups="common"/>
-  <project path="external/esd" name="platform/external/esd" groups="common"/>
-  <project path="external/expat" name="platform/external/expat" groups="common"/>
-  <project path="external/eyes-free" name="platform/external/eyes-free" groups="common"/>
-  <project path="external/fat32lib" name="platform/external/fat32lib" groups="common"/>
-  <project path="external/fdlibm" name="platform/external/fdlibm" groups="common"/>
-  <project path="external/flac" name="platform/external/flac" groups="common"/>
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" groups="common"/>
-  <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" groups="common"/>
-  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" groups="common"/>
-  <project path="external/genext2fs" name="platform/external/genext2fs" groups="common"/>
-  <project path="external/giflib" name="platform/external/giflib" groups="common"/>
-  <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" groups="common"/>
-  <project path="external/grub" name="platform/external/grub" groups="common"/>
-  <project path="external/harfbuzz" name="platform/external/harfbuzz" groups="common"/>
-  <project path="external/hamcrest" name="platform/external/hamcrest" groups="common"/>
-  <project path="external/hyphenation" name="platform/external/hyphenation" groups="common"/>
-  <project path="external/icu4c" name="platform/external/icu4c" groups="common"/>
-  <project path="external/iproute2" name="platform/external/iproute2" groups="common"/>
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" groups="common"/>
-  <project path="external/iptables" name="platform/external/iptables" groups="common"/>
-  <project path="external/jack" name="platform/external/jack" groups="common"/>
-  <project path="external/javasqlite" name="platform/external/javasqlite" groups="common"/>
-  <project path="external/javassist" name="platform/external/javassist" groups="common"/>
-  <project path="external/jdiff" name="platform/external/jdiff" groups="common"/>
-  <project path="external/jhead" name="platform/external/jhead" groups="common"/>
-  <project path="external/jmdns" name="platform/external/jmdns" groups="common"/>
-  <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" groups="common"/>
-  <project path="external/jsilver" name="platform/external/jsilver" groups="common"/>
-  <project path="external/jsr305" name="platform/external/jsr305" groups="common"/>
-  <project path="external/junit" name="platform/external/junit" groups="common"/>
-  <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="common"/>
-  <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="common"/>
-  <project path="external/libffi" name="platform/external/libffi" groups="common"/>
-  <project path="external/libgsm" name="platform/external/libgsm" groups="common"/>
-  <project path="external/liblzf" name="platform/external/liblzf" groups="common"/>
-  <project path="external/libmtp" name="platform/external/libmtp" groups="common"/>
-  <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="common"/>
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="common"/>
-  <project path="external/libnl-headers" name="platform/external/libnl-headers" groups="common"/>
-  <project path="external/libogg" name="platform/external/libogg" groups="common"/>
-  <project path="external/libpcap" name="platform/external/libpcap" groups="common"/>
-  <project path="external/libphonenumber" name="platform/external/libphonenumber" groups="common"/>
-  <project path="external/libpng" name="platform/external/libpng" groups="common"/>
-  <project path="external/libppp" name="platform/external/libppp" groups="common"/>
-  <project path="external/libselinux" name="platform/external/libselinux" groups="common"/>
-  <project path="external/libsepol" name="platform/external/libsepol" groups="common"/>
-  <project path="external/libusb" name="platform/external/libusb" groups="common"/>
-  <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="common"/>
-  <project path="external/libvorbis" name="platform/external/libvorbis" groups="common"/>
-  <project path="external/libxml2" name="platform/external/libxml2" groups="common"/>
-  <project path="external/libxslt" name="platform/external/libxslt" groups="common"/>
-  <project path="external/libyuv" name="platform/external/libyuv" groups="common"/>
-  <project path="external/littlemock" name="platform/external/littlemock" groups="common"/>
-  <project path="external/lohit-fonts" name="platform/external/lohit-fonts" groups="common"/>
-  <project path="external/markdown" name="platform/external/markdown" groups="common"/>
-  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="common"/>
-  <project path="external/mksh" name="platform/external/mksh" groups="common"/>
-  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="common"/>
-  <project path="external/mp4parser" name="platform/external/mp4parser" groups="common"/>
-  <project path="external/mtpd" name="platform/external/mtpd" groups="common"/>
-  <project path="external/naver-fonts" name="platform/external/naver-fonts" groups="common"/>
-  <project path="external/netcat" name="platform/external/netcat" groups="common"/>
-  <project path="external/netperf" name="platform/external/netperf" groups="common"/>
-  <project path="external/neven" name="platform/external/neven" groups="common"/>
-  <project path="external/nist-sip" name="platform/external/nist-sip" groups="common"/>
-  <project path="external/oauth" name="platform/external/oauth" groups="common"/>
-  <project path="external/okhttp" name="platform/external/okhttp" groups="common"/>
-  <project path="external/opencv" name="platform/external/opencv" groups="common"/>
-  <project path="external/openfst" name="platform/external/openfst" groups="common"/>
-  <project path="external/ppp" name="platform/external/ppp" groups="common"/>
-  <project path="external/proguard" name="platform/external/proguard" groups="common"/>
-  <project path="external/protobuf" name="platform/external/protobuf" groups="common"/>
-  <project path="external/qemu" name="platform/external/qemu" groups="common"/>
-  <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" groups="common"/>
-  <project path="external/regex-re2" name="platform/external/regex-re2" groups="common"/>
-  <project path="external/replicaisland" name="platform/external/replicaisland" groups="common"/>
-  <project path="external/safe-iop" name="platform/external/safe-iop" groups="common"/>
-  <project path="external/sepolicy" name="platform/external/sepolicy" groups="common"/>
-  <project path="external/smali" name="platform/external/smali" groups="common"/>
-  <project path="external/sqlite" name="platform/external/sqlite" groups="common"/>
-  <project path="external/srec" name="platform/external/srec" groups="common"/>
-  <project path="external/srtp" name="platform/external/srtp" groups="common"/>
-  <project path="external/svox" name="platform/external/svox" groups="common"/>
-  <project path="external/tagsoup" name="platform/external/tagsoup" groups="common"/>
-  <project path="external/tinyalsa" name="platform/external/tinyalsa"  groups="common"/>
-  <project path="external/tinyxml" name="platform/external/tinyxml" groups="common"/>
-  <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="common"/>
-  <project path="external/valgrind" name="platform/external/valgrind" groups="common"/>
-  <project path="external/webp" name="platform/external/webp" groups="common"/>
-  <project path="external/webrtc" name="platform/external/webrtc" groups="common"/>
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" groups="common"/>
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="common"/>
-  <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="common"/>
-  <project path="external/yaffs2" name="platform/external/yaffs2" groups="common"/>
-  <project path="external/zlib" name="platform/external/zlib" groups="common"/>
-  <project path="external/zxing" name="platform/external/zxing" groups="common"/>
-  <project path="frameworks/mff" name="platform/frameworks/mff" groups="common"/>
-  <project path="frameworks/ml" name="platform/frameworks/ml" groups="common"/>
-  <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" groups="common"/>
-  <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" groups="common"/>
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" groups="common"/>
-  <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="common"/>
-  <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" groups="common"/>
-  <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" groups="common"/>
-  <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="common"/>
-  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" groups="common"/>
-  <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="common"/>
-  <project path="frameworks/testing" name="platform/frameworks/testing" groups="common"/>
-  <project path="gdk" name="platform/gdk" groups="common"/>
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="common"/>
-  <project path="hardware/invensense" name="platform/hardware/invensense" groups="common"/>
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="common"/>
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" groups="common"/>
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" groups="common"/>
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" groups="common"/>
-  <project path="libnativehelper" name="platform/libnativehelper" groups="common"/>
-  <project path="ndk" name="platform/ndk" groups="common"/>
-  <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="common"/>
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="common"/>
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" groups="common"/>
-  <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" groups="common"/>
-  <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="common"/>
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="common"/>
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="common"/>
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" groups="common"/>
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" groups="common"/>
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" groups="common"/>
-  <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" groups="common"/>
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" groups="common"/>
-  <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" groups="common"/>
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="common"/>
-  <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="common"/>
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" groups="common"/>
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" groups="common"/>
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" groups="common"/>
-  <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" groups="common"/>
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" groups="common"/>
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" groups="common"/>
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" groups="common"/>
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="common"/>
-  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="common"/>
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="common"/>
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" groups="common"/>
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="common"/>
-  <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="common"/>
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" groups="common"/>
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" groups="common"/>
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" groups="common"/>
-  <project path="packages/apps/VideoEditor" name="platform/packages/apps/VideoEditor" groups="common"/>
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" groups="common"/>
-  <project path="packages/experimental" name="platform/packages/experimental" groups="common"/>
-  <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" groups="common"/>
-  <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" groups="common"/>
-  <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" groups="common"/>
-  <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" groups="common"/>
-  <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" groups="common"/>
-  <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" groups="common"/>
-  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" groups="common"/>
-  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" groups="common"/>
-  <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" groups="common"/>
-  <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" groups="common"/>
-  <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" groups="common"/>
-  <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" groups="common"/>
-  <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" groups="common"/>
-  <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" groups="common"/>
-  <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" groups="common"/>
-  <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" groups="common"/>
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" groups="common"/>
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" groups="common"/>
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" groups="common"/>
-  <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" groups="common"/>
-  <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" groups="common"/>
-  <project path="pdk" name="platform/pdk" groups="common"/>
+  <project path="abi/cpp" name="platform/abi/cpp" groups="common" />
+  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="common" />
+  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" groups="common" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" groups="common" />
+  <project path="device/asus/grouper" name="device/asus/grouper" groups="common" />
+  <project path="device/common" name="device/common" groups="common" />
+  <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="common" />
+  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="common" />
+  <project path="device/generic/common" name="device/generic/common" groups="common" />
+  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="common" />
+  <project path="device/generic/mips" name="device/generic/mips" groups="common" />
+  <project path="device/generic/x86" name="device/generic/x86" groups="common" />
+  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device,common" />
+  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,common" />
+  <project path="device/sample" name="device/sample" groups="common" />
+  <project path="device/samsung/toro" name="device/samsung/toro" groups="common" />
+  <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="common" />
+  <project path="external/aac" name="platform/external/aac" groups="common" />
+  <project path="external/android-clat" name="platform/external/android-clat" groups="common" />
+  <project path="external/android-mock" name="platform/external/android-mock" groups="common" />
+  <project path="external/ant-glob" name="platform/external/ant-glob" groups="common" />
+  <project path="external/antlr" name="platform/external/antlr" groups="common" />
+  <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="common" />
+  <project path="external/apache-http" name="platform/external/apache-http" groups="common" />
+  <project path="external/cyclictest" name="platform/external/cyclictest" revision="linaro_android" groups="vexpress"/>
+  <project path="external/sysbench" name="platform/external/sysbench" revision="linaro_android" groups="vexpress"/>
+  <project path="external/apache-qp" name="platform/external/apache-qp" groups="common" />
+  <project path="external/apache-xml" name="platform/external/apache-xml" groups="common" />
+  <project path="external/arduino" name="platform/external/arduino" groups="common" />
+  <project path="external/astl" name="platform/external/astl" groups="common" />
+  <project path="external/bison" name="platform/external/bison" groups="common" />
+  <project path="external/blktrace" name="platform/external/blktrace" groups="common" />
+  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="common" />
+  <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="common" />
+  <project path="external/bsdiff" name="platform/external/bsdiff" groups="common" />
+  <project path="external/bzip2" name="platform/external/bzip2" groups="common" />
+  <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="common" />
+  <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="common" />
+  <project path="external/cibu-fonts" name="platform/external/cibu-fonts" groups="common" />
+  <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="common" />
+  <project path="external/dbus" name="platform/external/dbus" groups="common" />
+  <project path="external/dexmaker" name="platform/external/dexmaker" groups="common" />
+  <project path="external/dhcpcd" name="platform/external/dhcpcd" groups="common" />
+  <project path="external/doclava" name="platform/external/doclava" groups="common" />
+  <project path="external/dropbear" name="platform/external/dropbear" groups="common" />
+  <project path="external/easymock" name="platform/external/easymock" groups="common" />
+  <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" groups="common" />
+  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" groups="common" />
+  <project path="external/emma" name="platform/external/emma" groups="common" />
+  <project path="external/esd" name="platform/external/esd" groups="common" />
+  <project path="external/expat" name="platform/external/expat" groups="common" />
+  <project path="external/eyes-free" name="platform/external/eyes-free" groups="common" />
+  <project path="external/fat32lib" name="platform/external/fat32lib" groups="common" />
+  <project path="external/fdlibm" name="platform/external/fdlibm" groups="common" />
+  <project path="external/flac" name="platform/external/flac" groups="common" />
+  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" groups="common" />
+  <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" groups="common" />
+  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" groups="common" />
+  <project path="external/genext2fs" name="platform/external/genext2fs" groups="common" />
+  <project path="external/giflib" name="platform/external/giflib" groups="common" />
+  <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" groups="common" />
+  <project path="external/grub" name="platform/external/grub" groups="common" />
+  <project path="external/harfbuzz" name="platform/external/harfbuzz" groups="common" />
+  <project path="external/hamcrest" name="platform/external/hamcrest" groups="common" />
+  <project path="external/hyphenation" name="platform/external/hyphenation" groups="common" />
+  <project path="external/icu4c" name="platform/external/icu4c" groups="common" />
+  <project path="external/iproute2" name="platform/external/iproute2" groups="common" />
+  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" groups="common" />
+  <project path="external/iptables" name="platform/external/iptables" groups="common" />
+  <project path="external/jack" name="platform/external/jack" groups="common" />
+  <project path="external/javasqlite" name="platform/external/javasqlite" groups="common" />
+  <project path="external/javassist" name="platform/external/javassist" groups="common" />
+  <project path="external/jdiff" name="platform/external/jdiff" groups="common" />
+  <project path="external/jhead" name="platform/external/jhead" groups="common" />
+  <project path="external/jmdns" name="platform/external/jmdns" groups="common" />
+  <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" groups="common" />
+  <project path="external/jsilver" name="platform/external/jsilver" groups="common" />
+  <project path="external/jsr305" name="platform/external/jsr305" groups="common" />
+  <project path="external/junit" name="platform/external/junit" groups="common" />
+  <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="common" />
+  <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="common" />
+  <project path="external/libffi" name="platform/external/libffi" groups="common" />
+  <project path="external/libgsm" name="platform/external/libgsm" groups="common" />
+  <project path="external/liblzf" name="platform/external/liblzf" groups="common" />
+  <project path="external/libmtp" name="platform/external/libmtp" groups="common" />
+  <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="common" />
+  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="common" />
+  <project path="external/libnl-headers" name="platform/external/libnl-headers" groups="common" />
+  <project path="external/libogg" name="platform/external/libogg" groups="common" />
+  <project path="external/libpcap" name="platform/external/libpcap" groups="common" />
+  <project path="external/libphonenumber" name="platform/external/libphonenumber" groups="common" />
+  <project path="external/libpng" name="platform/external/libpng" groups="common" />
+  <project path="external/libppp" name="platform/external/libppp" groups="common" />
+  <project path="external/libselinux" name="platform/external/libselinux" groups="common" />
+  <project path="external/libsepol" name="platform/external/libsepol" groups="common" />
+  <project path="external/libusb" name="platform/external/libusb" groups="common" />
+  <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="common" />
+  <project path="external/libvorbis" name="platform/external/libvorbis" groups="common" />
+  <project path="external/libxml2" name="platform/external/libxml2" groups="common" />
+  <project path="external/libxslt" name="platform/external/libxslt" groups="common" />
+  <project path="external/libyuv" name="platform/external/libyuv" groups="common" />
+  <project path="external/littlemock" name="platform/external/littlemock" groups="common" />
+  <project path="external/lohit-fonts" name="platform/external/lohit-fonts" groups="common" />
+  <project path="external/markdown" name="platform/external/markdown" groups="common" />
+  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="common" />
+  <project path="external/mksh" name="platform/external/mksh" groups="common" />
+  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="common" />
+  <project path="external/mp4parser" name="platform/external/mp4parser" groups="common" />
+  <project path="external/mtpd" name="platform/external/mtpd" groups="common" />
+  <project path="external/naver-fonts" name="platform/external/naver-fonts" groups="common" />
+  <project path="external/netcat" name="platform/external/netcat" groups="common" />
+  <project path="external/netperf" name="platform/external/netperf" groups="common" />
+  <project path="external/neven" name="platform/external/neven" groups="common" />
+  <project path="external/nist-sip" name="platform/external/nist-sip" groups="common" />
+  <project path="external/oauth" name="platform/external/oauth" groups="common" />
+  <project path="external/okhttp" name="platform/external/okhttp" groups="common" />
+  <project path="external/opencv" name="platform/external/opencv" groups="common" />
+  <project path="external/openfst" name="platform/external/openfst" groups="common" />
+  <project path="external/ppp" name="platform/external/ppp" groups="common" />
+  <project path="external/proguard" name="platform/external/proguard" groups="common" />
+  <project path="external/protobuf" name="platform/external/protobuf" groups="common" />
+  <project path="external/qemu" name="platform/external/qemu" groups="common" />
+  <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" groups="common" />
+  <project path="external/regex-re2" name="platform/external/regex-re2" groups="common" />
+  <project path="external/replicaisland" name="platform/external/replicaisland" groups="common" />
+  <project path="external/safe-iop" name="platform/external/safe-iop" groups="common" />
+  <project path="external/sepolicy" name="platform/external/sepolicy" groups="common" />
+  <project path="external/smali" name="platform/external/smali" groups="common" />
+  <project path="external/sqlite" name="platform/external/sqlite" groups="common" />
+  <project path="external/srec" name="platform/external/srec" groups="common" />
+  <project path="external/srtp" name="platform/external/srtp" groups="common" />
+  <project path="external/svox" name="platform/external/svox" groups="common" />
+  <project path="external/tagsoup" name="platform/external/tagsoup" groups="common" />
+  <project path="external/tinyalsa" name="platform/external/tinyalsa"  groups="common" />
+  <project path="external/tinyxml" name="platform/external/tinyxml" groups="common" />
+  <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="common" />
+  <project path="external/valgrind" name="platform/external/valgrind" groups="common" />
+  <project path="external/webp" name="platform/external/webp" groups="common" />
+  <project path="external/webrtc" name="platform/external/webrtc" groups="common" />
+  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" groups="common" />
+  <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="common" />
+  <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="common" />
+  <project path="external/yaffs2" name="platform/external/yaffs2" groups="common" />
+  <project path="external/zlib" name="platform/external/zlib" groups="common" />
+  <project path="external/zxing" name="platform/external/zxing" groups="common" />
+  <project path="frameworks/mff" name="platform/frameworks/mff" groups="common" />
+  <project path="frameworks/ml" name="platform/frameworks/ml" groups="common" />
+  <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" groups="common" />
+  <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" groups="common" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" groups="common" />
+  <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="common" />
+  <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" groups="common" />
+  <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" groups="common" />
+  <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="common" />
+  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" groups="common" />
+  <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="common" />
+  <project path="frameworks/testing" name="platform/frameworks/testing" groups="common" />
+  <project path="gdk" name="platform/gdk" groups="common" />
+  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="common" />
+  <project path="hardware/invensense" name="platform/hardware/invensense" groups="common" />
+  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="common" />
+  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" groups="common" />
+  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" groups="common" />
+  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" groups="common" />
+  <project path="libnativehelper" name="platform/libnativehelper" groups="common" />
+  <project path="ndk" name="platform/ndk" groups="common" />
+  <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="common" />
+  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="common" />
+  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" groups="common" />
+  <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" groups="common" />
+  <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="common" />
+  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="common" />
+  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="common" />
+  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" groups="common" />
+  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" groups="common" />
+  <project path="packages/apps/Email" name="platform/packages/apps/Email" groups="common" />
+  <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" groups="common" />
+  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" groups="common" />
+  <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" groups="common" />
+  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="common" />
+  <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="common" />
+  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" groups="common" />
+  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" groups="common" />
+  <project path="packages/apps/Music" name="platform/packages/apps/Music" groups="common" />
+  <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" groups="common" />
+  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" groups="common" />
+  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" groups="common" />
+  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" groups="common" />
+  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="common" />
+  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="common" />
+  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="common" />
+  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" groups="common" />
+  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="common" />
+  <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="common" />
+  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" groups="common" />
+  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" groups="common" />
+  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" groups="common" />
+  <project path="packages/apps/VideoEditor" name="platform/packages/apps/VideoEditor" groups="common" />
+  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" groups="common" />
+  <project path="packages/experimental" name="platform/packages/experimental" groups="common" />
+  <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" groups="common" />
+  <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" groups="common" />
+  <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" groups="common" />
+  <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" groups="common" />
+  <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" groups="common" />
+  <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" groups="common" />
+  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" groups="common" />
+  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" groups="common" />
+  <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" groups="common" />
+  <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" groups="common" />
+  <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" groups="common" />
+  <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" groups="common" />
+  <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" groups="common" />
+  <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" groups="common" />
+  <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" groups="common" />
+  <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" groups="common" />
+  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" groups="common" />
+  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" groups="common" />
+  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" groups="common" />
+  <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" groups="common" />
+  <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" groups="common" />
+  <project path="pdk" name="platform/pdk" groups="common" />
   <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin,common" />
   <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin,common" />
   <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux,common" />
   <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux,common" />
-  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="common"/>
+  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="common" />
   <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
   <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" />
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" groups="darwin,arm,common"/>
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" groups="darwin,arm,common"/>
-  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" groups="darwin,mips,common"/>
-  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="darwin,x86,common"/>
-  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="linux,arm,common"/>
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="linux,arm,common"/>
-  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" groups="linux,common"/>
-  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" groups="linux,common"/>
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" groups="linux,common"/>
-  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" groups="linux,mips,common"/>
-  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="linux,x86,common"/>
-  <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="common"/>
-  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="common"/>
-  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="common"/>
-  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="common"/>
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="common"/>
-  <project path="sdk" name="platform/sdk" groups="common"/>
-  <project path="system/bluetooth" name="platform/system/bluetooth" groups="common"/>
-  <project path="system/netd" name="platform/system/netd" groups="common"/>
-  <project path="tools/build" name="platform/tools/build" groups="toolsbuild,common"/>
-  <project path="tools/motodev" name="platform/tools/motodev" groups="common"/>
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" groups="darwin,arm,common" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" groups="darwin,arm,common" />
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" groups="darwin,mips,common" />
+  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="darwin,x86,common" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="linux,arm,common" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="linux,arm,common" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" groups="linux,common" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" groups="linux,common" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" groups="linux,common" />
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" groups="linux,mips,common" />
+  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="linux,x86,common" />
+  <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="common" />
+  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="common" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="common" />
+  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="common" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="common" />
+  <project path="sdk" name="platform/sdk" groups="common" />
+  <project path="system/bluetooth" name="platform/system/bluetooth" groups="common" />
+  <project path="system/netd" name="platform/system/netd" groups="common" />
+  <project path="tools/build" name="platform/tools/build" groups="toolsbuild,common" />
+  <project path="tools/motodev" name="platform/tools/motodev" groups="common" />
 </manifest>
-- 
cgit v1.2.3