summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2015-11-18 15:46:06 -0800
committerBaligh Uddin <baligh@google.com>2015-11-18 15:46:06 -0800
commit24fda7a8b2546149326d2bea3f7c106f8ce9f351 (patch)
treec120d75c9301e5eae801c089a6f4d8f903476750
parent9cf96e9f33cea0a386780fc2e3b4eccf2aac4ec3 (diff)
downloadmanifest-24fda7a8b2546149326d2bea3f7c106f8ce9f351.tar.gz
Update marshmallow-cts-release manifest to ensure it points to one revision.
Bug: 25730187
-rw-r--r--default.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/default.xml b/default.xml
index cc07989a9..19ce74ca3 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
<remote name="aosp"
fetch=".."
review="https://android-review.googlesource.com/" />
- <default revision="marshmallow-release"
+ <default revision="marshmallow-cts-release"
remote="aosp"
sync-j="4" />
@@ -13,9 +13,9 @@
</project>
<project path="abi/cpp" name="platform/abi/cpp" groups="pdk" />
<project path="art" name="platform/art" groups="pdk" />
- <project path="bionic" name="platform/bionic" revision="marshmallow-cts-dev" groups="pdk" />
+ <project path="bionic" name="platform/bionic" groups="pdk" />
<project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
- <project path="cts" name="platform/cts" revision="marshmallow-cts-dev" groups="cts,pdk-cw-fs,pdk-fs" />
+ <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" />
<project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" />
<project path="developers/build" name="platform/developers/build" />
<project path="developers/demos" name="platform/developers/demos" />
@@ -78,7 +78,7 @@
<project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" />
<project path="external/conscrypt" name="platform/external/conscrypt" groups="pdk-cw-fs,pdk-fs" />
<project path="external/crcalc" name="platform/external/crcalc" groups="pdk-fs" />
- <project path="external/deqp" name="platform/external/deqp" revision="marshmallow-cts-dev" groups="pdk-fs" />
+ <project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" />
<project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" />
<project path="external/dhcpcd" name="platform/external/dhcpcd" groups="pdk-cw-fs,pdk-fs" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" />
@@ -207,7 +207,7 @@
<project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" />
<project path="external/oauth" name="platform/external/oauth" groups="pdk-cw-fs,pdk-fs" />
<project path="external/objenesis" name="platform/external/objenesis" groups="pdk-cw-fs,pdk-fs" />
- <project path="external/okhttp" name="platform/external/okhttp" revision="marshmallow-cts-dev" groups="pdk-cw-fs,pdk-fs" />
+ <project path="external/okhttp" name="platform/external/okhttp" groups="pdk-cw-fs,pdk-fs" />
<project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs,pdk-fs" />
<project path="external/openfst" name="platform/external/openfst" groups="pdk-cw-fs,pdk-fs" />
<project path="external/openssh" name="platform/external/openssh" groups="pdk-cw-fs,pdk-fs" />
@@ -225,7 +225,7 @@
<project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" />
<project path="external/scrypt" name="platform/external/scrypt" groups="pdk" />
<project path="external/selinux" name="platform/external/selinux" groups="pdk" />
- <project path="external/sepolicy" name="platform/external/sepolicy" revision="marshmallow-cts-dev" groups="pdk" />
+ <project path="external/sepolicy" name="platform/external/sepolicy" groups="pdk" />
<project path="external/sfntly" name="platform/external/sfntly" groups="pdk,qcom_msm8x26" />
<project path="external/skia" name="platform/external/skia" groups="pdk,qcom_msm8x26" />
<project path="external/slf4j" name="platform/external/slf4j" groups="pdk-fs" />
@@ -339,7 +339,7 @@
<project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" groups="omap3" />
<project path="hardware/ti/omap4-aah" name="platform/hardware/ti/omap4-aah" groups="omap4-aah" />
<project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" groups="omap4" />
- <project path="libcore" name="platform/libcore" revision="marshmallow-cts-dev" groups="pdk" />
+ <project path="libcore" name="platform/libcore" groups="pdk" />
<project path="libnativehelper" name="platform/libnativehelper" groups="pdk" />
<project path="ndk" name="platform/ndk" groups="generic_fs" />
<project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs" />