diff options
| author | Patrik Ryd <patrik.ryd@linaro.org> | 2011-08-08 08:31:51 +0100 |
|---|---|---|
| committer | Patrik Ryd <patrik.ryd@linaro.org> | 2011-08-08 08:31:51 +0100 |
| commit | 0cb8564d6ae2d303555d3d5218d6a255c5c5dba5 (patch) | |
| tree | 4dd7029ef71d21ebb0477c79ce1f2875ccf826f3 | |
| parent | 94491a19ee1444f63706a10f4b04af844aad3451 (diff) | |
| parent | 8c4353a0d2ef791b18fc1a7157101d0f7cf596c2 (diff) | |
| download | manifest-0cb8564d6ae2d303555d3d5218d6a255c5c5dba5.tar.gz | |
Merge commit 'android-2.3.5_r1' into linaro_android_2.3.5
| -rw-r--r-- | default.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/default.xml b/default.xml index f5a52a22a..c99825cf4 100644 --- a/default.xml +++ b/default.xml @@ -3,7 +3,7 @@ <remote name="korg" fetch="git://android.git.kernel.org/" review="review.source.android.com" /> - <default revision="refs/tags/android-2.3.4_r1" + <default revision="refs/tags/android-2.3.5_r1" remote="korg" /> <remote name="linaro-android" @@ -71,8 +71,11 @@ <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="device/samsung/crespo4g" name="device/samsung/crespo4g" /> <project path="external/apache-http" name="platform/external/apache-http" /> <project path="external/astl" name="platform/external/astl" /> <project path="external/bison" name="platform/external/bison" /> @@ -161,6 +164,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 +181,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" /> |