summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Ryd <patrik.ryd@linaro.org>2011-08-11 13:08:20 +0200
committerPatrik Ryd <patrik.ryd@linaro.org>2011-08-12 13:31:14 +0200
commit09a3678aa77441bd7f08b69b714829cea6bb16f4 (patch)
tree1fdca6f0d3f0d74dbef0a124070cf50ea1dc62b7
parentdf80480be46d9c8e681cedf5306401c273e71228 (diff)
parent8c4353a0d2ef791b18fc1a7157101d0f7cf596c2 (diff)
downloadmanifest-09a3678aa77441bd7f08b69b714829cea6bb16f4.tar.gz
Merge commit 'android-2.3.5_r1' into linaro_android_2.3.5
Change-Id: I2ac1ed088d8fb53f1a1f09fc4a1f1fb2bde67540
-rw-r--r--default.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index 27aa61dba..103037925 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
<remote name="korg"
fetch="git://android.git.linaro.org/"
review="review.android.git.linaro.org" />
- <default revision="refs/tags/android-2.3.4_r1"
+ <default revision="refs/tags/android-2.3.5_r1"
remote="korg" />
<remote name="linaro-android"
@@ -72,6 +72,8 @@
<project path="cts" name="platform/cts" />
<project path="development" name="platform/development" />
<project path="device/common" name="device/common" />
+ <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
+ <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
<project path="device/sample" name="device/sample" />
<project path="device/samsung/crespo" name="device/samsung/crespo" />
<project path="external/apache-http" name="platform/external/apache-http" />
@@ -161,6 +163,7 @@
<project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
<project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
+ <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
<project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
<project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
<project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
@@ -177,6 +180,7 @@
<project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
<project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
<project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
<project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
<project path="packages/apps/Stk" name="platform/packages/apps/Stk" />