Merge android-4.2_r1

Change-Id: Ibc293ae82f4efe42f9adb2302eac17ad9096a53b
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

16 files changed, 841 insertions, 841 deletions

diff --git a/default.xml b/default.xml
index b146feb..1f0d65a 100644
--- a/default.xml
+++ b/default.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -56,95 +56,95 @@
 
   <!-- AOSP with Linaro additions -->
   <!-- Linaro modifications: Made it build with OpenJDK -->
-  <project path="build" name="platform/build" revision="linaro_android_4.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make sure we can find omapfb.h -->
   <!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, various bugfixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase maximum number of partitions -->
-  <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.1.2"/>
+  <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.2"/>
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2"/>
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2"/>
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2"/>
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2"/>
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- 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.1.2"/>
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2"/>
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2"/>
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2"/>
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2"/>
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2"/>
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Need porting -->
-  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.2_r1" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2_r1" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
-  <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.2_r1" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.2_r1" />
-  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.2_r1" />
-  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.2_r1" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+  <project path="cts" name="platform/cts" revision="refs/tags/android-4.2_r1" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.2_r1" />
+  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2_r1" />
+  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2_r1" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.2_r1" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2_r1" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
   <!-- Linaro modification: ISO C++ 11 support -->
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 682da0c..cd05ae5 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -65,95 +65,95 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2"/>
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
   <!-- Linaro modification: ISO C++ 11 support -->
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 92c0575..ed5eb16 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -12,7 +12,7 @@
 	   fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -64,95 +64,95 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <!-- Linaro modification: ISO C++ 11 support -->
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 4429d6c..af8457a 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -51,94 +51,94 @@
 
   <!-- AOSP with Linaro additions -->
   <!-- Linaro modifications: Made it build with OpenJDK -->
-  <project path="build" name="platform/build" revision="linaro_android_4.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make sure we can find omapfb.h -->
   <!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, various bugfixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase maximum number of partitions -->
-  <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.1.2"/>
+  <project path="system/vold" name="platform/system/vold"  revision="linaro_android_4.2"/>
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2"/>
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2"/>
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2"/>
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2"/>
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- 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.1.2"/>
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2"/>
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2"/>
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2"/>
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2"/>
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2"/>
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Need porting -->
-  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.1.2" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.2_r1" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2_r1" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
-  <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.2_r1" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.2_r1" />
-  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.2_r1" />
-  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.2_r1" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+  <project path="cts" name="platform/cts" revision="refs/tags/android-4.2_r1" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.2_r1" />
+  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2_r1" />
+  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2_r1" />
   <!-- Linaro modifications: ISO C++11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.2_r1" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2_r1" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
   <!-- Linaro modification: ISO C++ 11 support -->
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 645c763..1fda85c 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -64,95 +64,95 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
   <!-- Linaro modification: ISO C++ 11 support -->
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 517cd99..367f06a 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -62,94 +62,94 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 8e6d861..f2881d7 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -14,7 +14,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -72,95 +72,95 @@
   <!-- AOSP with Linaro additions -->
 
   <!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
-  <project path="build" name="platform/build" revision="linaro_android_4.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
 
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index d14cf69..f876f60 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -71,95 +71,95 @@
   <!-- AOSP with Linaro additions -->
 
   <!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
-  <project path="build" name="platform/build" revision="linaro_android_4.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
 
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index e93ff30..ec3842f 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -64,94 +64,94 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 032c69f..cea77f2 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -62,93 +62,93 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index cbf1ca2..a11c11f 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -61,94 +61,94 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index 8312b23..df131d8 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -64,92 +64,92 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2"/>
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress-lw.xml b/tracking-vexpress-lw.xml
index ed2f826..6fd5606 100644
--- a/tracking-vexpress-lw.xml
+++ b/tracking-vexpress-lw.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -66,94 +66,94 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index 8ffccd0..a85cc07 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -68,95 +68,95 @@
   <!-- AOSP with Linaro additions -->
 
   <!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
-  <project path="build" name="platform/build" revision="linaro_android_4.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
 
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index 16886ea..df98c87 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -14,7 +14,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -69,94 +69,94 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 7145509..08ff9d4 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -12,7 +12,7 @@
            fetch="git://github.com/rperier/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.1.2_r1"
+  <default revision="refs/tags/android-4.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -65,94 +65,94 @@
 
   <!-- 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.1.2">
+  <project path="build" name="platform/build" revision="linaro_android_4.2">
     <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.1.2" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.1.2" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.1.2" />
-  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.1.2" />
-  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.1.2" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_4.2" />
+  <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
+  <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.1.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.2" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
   <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.2"/>
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: gcc 4.7 support -->
-  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.2" />
-  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.2" />
-  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.2" />
-  <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.2" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
+  <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
+  <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
-  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.2" />
+  <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
-  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.2" />
+  <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.1.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
-  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.2" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.1.2" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
   <!-- 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.1.2" />
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
-  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.2" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Fix aliasing violations -->
-  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.2" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_4.1.2" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.2"/>
-  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.2" />
-  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.2" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.2" />
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
+  <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
+  <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
-  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.2" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.2" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.2" />
-  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.2" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.2" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.2" />
-  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
-  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.2" />
-  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.2" />
-  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.1.2" />
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
+  <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
+  <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+  <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
+  <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+  <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
-  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
-  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.2" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.2"/>
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.2" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
   <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
   <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++ 11 support -->
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
-  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.2" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />