diff --git a/base-for-3.0-gpl.xml b/base-for-3.0-gpl.xml
deleted file mode 100644
index 3978875..0000000
--- a/base-for-3.0-gpl.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <remote  name="aosp"
-           fetch=".." />
-  <default revision="master"
-           remote="aosp"
-           sync-j="4" />
-  
-  <project name="device/common" revision="923fa910b497abcd1685875b9dea66118fd85590"/>
-  <project name="device/htc/common" revision="4d8a1179833237be6871f7663c77cc3c50b25ff6"/>
-  <project name="device/htc/passion" revision="53b794fdf66962bd42924820ee58f2ea851626ef"/>
-  <project name="device/htc/passion-common" revision="9677ae83222a21c21d8a27115a7bbfe577f64da8"/>
-  <project name="device/sample" revision="433c857afdc70b56b8034dd513cf1fc97dee3ffd"/>
-  <project name="device/samsung/crespo" revision="b1fff37eba7eb820da0fd8b78116d525670f4af2"/>
-  <project name="platform/bionic" path="bionic" revision="3ef36b2115d0802e668e325b59af6ef14d999e71"/>
-  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
-  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="b354f6abda00461eae4cb0215faa8b5a7268e275"/>
-  <project name="platform/bootable/recovery" path="bootable/recovery" revision="8d58c957036835db148acc4e506633a016dc6c7e"/>
-  <project name="platform/build" path="build" revision="d5f84555b661c359e2465b00ddbd2bd0932442c1">
-    <copyfile dest="Makefile" src="core/root.mk"/>
-  </project>
-  <project name="platform/cts" path="cts" revision="17d7a547d38fd28d8838543b5dbd15c251b3f815"/>
-  <project name="platform/dalvik" path="dalvik" revision="d063e255ed3f3363f5edc3c9a480dcea465bcab2"/>
-  <project name="platform/development" path="development" revision="bfdff660a66eda206e1f289d56a2e335f65a9398"/>
-  <project name="platform/external/apache-http" path="external/apache-http" revision="e59c288fca5a99d07f09494e8d03a228a347c3f8"/>
-  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
-  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
-  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
-  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="9ab9ea7fb50278f93daefd27ce7ed2e2b770252c"/>
-  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="16a8c02e35da2cf8adf1a7d304a9f53851a7b151"/>
-  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
-  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
-  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
-  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
-  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
-  <project name="platform/external/clearsilver" path="external/clearsilver" revision="4e7d837c51b575cdfc267e399159ebf185cefe2b"/>
-  <project name="platform/external/dbus" path="external/dbus" revision="f022f55d3ce46acf1fba3121642668c2b1262c72"/>
-  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="07e6bad27beabac5f4ed795fbbc7c8b564b14495"/>
-  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="e17deb5139e6d1fe04be90edbed7f061e8da3ab0"/>
-  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
-  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="8bc4f69c082b6202f4ad25df0819dd2c61b84292"/>
-  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
-  <project name="platform/external/elfcopy" path="external/elfcopy" revision="83a9e97f988380cb719825bcb054aa64455d7207"/>
-  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
-  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
-  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
-  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
-  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
-  <project name="platform/external/fdlibm" path="external/fdlibm" revision="26ea4299bba7c618fdf97624b39e33444410896d"/>
-  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
-  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="477904934945ff04029cfa26a9030a908fbdb2d2"/>
-  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
-  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
-  <project name="platform/external/grub" path="external/grub" revision="3df932be86571f448249168828255c9fadaad76e"/>
-  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
-  <project name="platform/external/guava" path="external/guava" revision="6c5bbdd3d9fdd0d74a6519a329708b406d5294c6"/>
-  <project name="platform/external/harfbuzz" path="external/harfbuzz" revision="ca4c6948f69f807967f91d0e995716dd0f421dc5"/>
-  <project name="platform/external/hyphenation" path="external/hyphenation" revision="2c8b0b3430ee6a9ee501e6cc7921f8790851c286"/>
-  <project name="platform/external/icu4c" path="external/icu4c" revision="fa7b84a26dd6c44cb0d219ef7b2f7e258219b616"/>
-  <project name="platform/external/iproute2" path="external/iproute2" revision="722fcc24bc9c1d1066e01ba8890c20602d5c8413"/>
-  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="17b44fbcb08bc68fad70eebdbab3b6a782e1ea10"/>
-  <project name="platform/external/iptables" path="external/iptables" revision="4a820b4c41de49482adce1a4e7424ca124b6b233"/>
-  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
-  <project name="platform/external/jhead" path="external/jhead" revision="c5a256626bd67390bab579f4e52f27bdd6ce5b7c"/>
-  <project name="platform/external/jpeg" path="external/jpeg" revision="46c05833c257ab46c42182cbb2ae359892d14443"/>
-  <project name="platform/external/jsilver" path="external/jsilver" revision="8024e81e2acd5252edd7b40df9f884df99997db5"/>
-  <project name="platform/external/jsr305" path="external/jsr305" revision="21f54bf13529077971e89b21f1af88d3b7532b84"/>
-  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
-  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="2b1f0cb83b50002300278b5f05de183bae2b44a1"/>
-  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
-  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
-  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="38d23e3d2bdaf9f484fabb1d6f42bb51ac15bd02"/>
-  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
-  <project name="platform/external/libpng" path="external/libpng" revision="7b81f64c8315ead539c7955fbc790e7596376119"/>
-  <project name="platform/external/libvpx" path="external/libvpx" revision="76e0247ec867fcc232fc79f21e9bf85d3c3a5a3f"/>
-  <project name="platform/external/libxml2" path="external/libxml2" revision="f2da8ef9b4e7243c19e295fed847fa897e8230d3"/>
-  <project name="platform/external/libxslt" path="external/libxslt" revision="d9120218522dc5da663e78996d0f042c0a62bc5e"/>
-  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
-  <project name="platform/external/netcat" path="external/netcat" revision="2b3431e2762434dff96ff279069e3796ef2d4333"/>
-  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
-  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
-  <project name="platform/external/nist-sip" path="external/nist-sip" revision="4794d8f3a9318e063cd08501ddf66fa767af0c19"/>
-  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
-  <project name="platform/external/openssl" path="external/openssl" revision="bbb2e706f6d9aeb29f7119ca3edd87e9a578222a"/>
-  <project name="platform/external/oprofile" path="external/oprofile" revision="219a1d03a9de33ae62abdb0cf5c45126940d0ace"/>
-  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
-  <project name="platform/external/ppp" path="external/ppp" revision="b273b20c6052f14868d803040cc2d78b330358cb"/>
-  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
-  <project name="platform/external/protobuf" path="external/protobuf" revision="8d24c6add5f0a6640948afccd9976b64a04a8ed3"/>
-  <project name="platform/external/qemu" path="external/qemu" revision="95ea5b25db2dc300db560f9af5edabd1da438de5"/>
-  <project name="platform/external/qemu-pc-bios" path="external/qemu-pc-bios" revision="930baf66aeb08c8c72fb5ab3194014d41bb18f94"/>
-  <project name="platform/external/quake" path="external/quake" revision="603564cc40b6ee217b8be31ea08cd14f02f44679"/>
-  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
-  <project name="platform/external/skia" path="external/skia" revision="352a8162a61f37dfee340fe3365c4f8566f0db19"/>
-  <project name="platform/external/sonivox" path="external/sonivox" revision="42196fd10398c7250af364c0563893d209c8cc15"/>
-  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
-  <project name="platform/external/sqlite" path="external/sqlite" revision="41a36383afe9ab10aefa488acb1677f5675b2358"/>
-  <project name="platform/external/srec" path="external/srec" revision="d2aa1305744ec45eec732eb535dae4d42820a3f8"/>
-  <project name="platform/external/stlport" path="external/stlport" revision="534b7341a1d4b2972d373e5d5f10452b245a6c50"/>
-  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
-  <project name="platform/external/svox" path="external/svox" revision="baadee213d3350ab18fbd0c22a3ac3a65a853a4c"/>
-  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
-  <project name="platform/external/tcpdump" path="external/tcpdump" revision="532b8f38c144da9a298260a5d8978ab9e8e3856c"/>
-  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
-  <project name="platform/external/tremolo" path="external/tremolo" revision="ef03ae17fcbd7474f839cc2fee27a58369cf41dd"/>
-  <project name="platform/external/v8" path="external/v8" revision="df5bff59602802b769e994b0dc1d8869a27fa40c"/>
-  <project name="platform/external/webkit" path="external/webkit" revision="4c418d6168b93e442dfcff7da1a4b7233a630f6d"/>
-  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
-  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
-  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
-  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
-  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="08d9d9a46250c4fad66e9b637e8898a3524c4286"/>
-  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
-  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="49f8fa5f480ae382f9087fde333b50072b214ad2"/>
-  <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="e471b83f1c2d3982fae0307f37c1ca30ca7e6837"/>
-  <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="3629275560f4a952cedd69c76b7b96b3b490f6f6"/>
-  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="ef6b8ea3f664254958491f48fbe38c502d1129df"/>
-  <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="39c0d4c031d479a679900cb540253f42747cb810"/>
-  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="a162c4351926285892214b0726aaf07f0631dc72"/>
-  <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="36fb5888a17a2d1ca69c7c2e2d378127f354153b"/>
-  <project name="platform/hardware/ril" path="hardware/ril" revision="08929fd6715b2b6a02f25b23704923d98c15a3b9"/>
-  <project name="platform/hardware/ti/omap3" path="hardware/ti/omap3" revision="5e6ec733aa694cae952e2e983a04c81a879d9824"/>
-  <project name="platform/hardware/ti/wlan" path="hardware/ti/wlan" revision="b2108e34759a48a52752e188fbff5a201d45c6b1"/>
-  <project name="platform/libcore" path="libcore" revision="b2b89da2035b0495f728344fcd4476bdb677dda9"/>
-  <project name="platform/ndk" path="ndk" revision="88d79f36c27e474501272838bb26917f410d4159"/>
-  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="2b4794ea46c2e21dbf016f77629cfec2c51d7e92"/>
-  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="c298d29b081e4240c80750e9431b7189d0b38513"/>
-  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="5334e3aca1dbfcae07a0ec9798872a0cb42a5fcf"/>
-  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="a86dd5f232c39830741f7d699e42e400d6024ac1"/>
-  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="9fd713cc0c0cb22717706f151541111a28b66294"/>
-  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="80d500c4671ee11ca331479d214641bcb32cea0a"/>
-  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="1c0e598a40acfcc57d267492e89c0f9d86f15a7a"/>
-  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="66cb11d8a71665adee3c30c008d08b5db985d6cc"/>
-  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="577dd971572126ec15a17fdbcafd34c5f38e538a"/>
-  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="dfe62ed4523f9ee75f67dc3f352393aa1bd45541"/>
-  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="58f759f4f230527e15c25da067ca24fdba9d75b9"/>
-  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="c6db74956c5d8f16f421745eea5123876ef3e525"/>
-  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="9fad3070fcc4ad45024246cf530dad996c92327e"/>
-  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3b80e51fb7e2e4eae69a2de3ca6618a92e99afa1"/>
-  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="cf714b71db7b6b86a49a52464f2c760b42634c52"/>
-  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="0dc3115358faa5573b68703469b5799cdd829499"/>
-  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="bd555ee64250126b60b24814120a2049943920ca"/>
-  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="29b9f0bbdc35366450f14124588e1688cc5c8f7e"/>
-  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="bde386d432aa0ad478f8866b813c09208b57716b"/>
-  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="9917561917b79c88ab7cf9e1562761cf6494fb77"/>
-  <project name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="f31b933a8aebf07e3feb512ac650c5691c8c5e0f"/>
-  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="1bd761abb49aec5f5163079ecbbdd874c3a6e03c"/>
-  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="7fceefa79229ece2efab0446841543a8f8f20a1d"/>
-  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="30fe588f6b45c945b0379d009ddd6c7e499ac3d3"/>
-  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
-  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d5ee8b86837a5db0a4d2d20f7eafc6fc85e3e25c"/>
-  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="862b975969e386fc7fa611c58e0e657c6977c83e"/>
-  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="2e9083178a7bb9b761c94c5f510b1cbdf7f52894"/>
-  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
-  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="708a66efffab067798f4d0ac58493da5c10ca8f0"/>
-  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
-  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="f0b45dc1745cdd5530f693fcceb12c18846a01f5"/>
-  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="5123bf283e3a1147cff34d0cd493316c630a5e32"/>
-  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="6694d2f916368f1d023672675a78f4653108e2a1"/>
-  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
-  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="93f2d340039d3aeceb074908e632efdbad0e6718"/>
-  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="57761b3140858cef6499602653608f4e977d1011"/>
-  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
-  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="898a9c830e2a806c6ce6b7a46d5517f924c065bf"/>
-  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="3f8d6fbb0986096be2b72cc92cfd722203274bee"/>
-  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
-  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="583aae3ac869c35d0e45d0e6839a5225c8fc48bc"/>
-  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="8903aebecc4717f2b19ad7583b16684f25177a0b"/>
-  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
-  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="5990d2459017ab3a404e774115ebcc2c414e3136"/>
-  <project name="platform/prebuilt" path="prebuilt" revision="7e61cc433964630bd62325cc010c6067f8c2c080"/>
-  <project name="platform/sdk" path="sdk" revision="d4087784bdc819a6ef4965c08c96ad2d4387f712"/>
-  <project name="platform/system/bluetooth" path="system/bluetooth" revision="9bd982632d50543f9e080a7595344591ab62874b"/>
-  <project name="platform/system/core" path="system/core" revision="d37e0840d75ef133083181f9f95dff9aa46a1b16"/>
-  <project name="platform/system/extras" path="system/extras" revision="880071e1ac4d35035fa30ddd992b81360408074b"/>
-  <project name="platform/system/media" path="system/media" revision="04f8400dae4e9c26e8e6bdf707513304cd5bc5df"/>
-  <project name="platform/system/netd" path="system/netd" revision="54a9575bb7a83ef859ebf4fa2cd610e65b6e9db2"/>
-  <project name="platform/system/vold" path="system/vold" revision="c1d80272b117cf837de93fadd8d456d89a203e2f"/>
-  <project name="platform/system/wlan/ti" path="system/wlan/ti" revision="3baca6cc248e0d9a852c25b214c92bc856ae03ea"/>
-  <project name="platform/tools/tradefederation" path="tools/tradefederation" revision="550704434c1e3c81ccd6e9c9e06bbee0f202ca07"/>
-</manifest>
diff --git a/base-for-3.1-gpl.xml b/base-for-3.1-gpl.xml
deleted file mode 100644
index 6396611..0000000
--- a/base-for-3.1-gpl.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <remote  name="aosp"
-           fetch=".." />
-  <default revision="master"
-           remote="aosp"
-           sync-j="4" />
-  
-  <project name="device/common" revision="523e077fb8fe899680c33539155d935e0624e40a"/>
-  <project name="device/google/accessory/arduino" revision="1cc19a7049e14898425e9f1cd53153d268094706"/>
-  <project name="device/google/accessory/demokit" revision="c91d5884056b4a13f7f990aebf62f6c698856fea"/>
-  <project name="device/htc/common" revision="4d8a1179833237be6871f7663c77cc3c50b25ff6"/>
-  <project name="device/htc/passion" revision="8aff9eacadb815373dd3d9bc8ed04527846df715"/>
-  <project name="device/htc/passion-common" revision="b82f06616db76bfd3cae78c5b33a75c9a0c5192e"/>
-  <project name="device/sample" revision="6a57249bc3e56530ae5dc4d61d536ec23e578331"/>
-  <project name="device/samsung/crespo" revision="a0e4484b8eba440038050b02195e7cd81eeb4b64"/>
-  <project name="device/samsung/crespo4g" revision="4dc6618e27b8a785b501f52f37242be2963943c1"/>
-  <project name="platform/bionic" path="bionic" revision="e8f7e30b05c6ba103d64c1fb3cd5ef2b17be7aab"/>
-  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
-  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="b354f6abda00461eae4cb0215faa8b5a7268e275"/>
-  <project name="platform/bootable/recovery" path="bootable/recovery" revision="8d58c957036835db148acc4e506633a016dc6c7e"/>
-  <project name="platform/build" path="build" revision="91e29275454633911cb59f4e5499de5ffe85e9a6">
-    <copyfile dest="Makefile" src="core/root.mk"/>
-  </project>
-  <project name="platform/cts" path="cts" revision="a2ad41e48babfeeb8f4d50df1c7ab1d26cfb6521"/>
-  <project name="platform/dalvik" path="dalvik" revision="d063e255ed3f3363f5edc3c9a480dcea465bcab2"/>
-  <project name="platform/development" path="development" revision="d1ac6bdc3b3b4c2fe788d8b8f7886ac625cb1559"/>
-  <project name="platform/external/apache-http" path="external/apache-http" revision="e59c288fca5a99d07f09494e8d03a228a347c3f8"/>
-  <project name="platform/external/apache-qp" path="external/apache-qp" revision="64ea622b23e6612eb8e7dcae6bfd4314beb022a8"/>
-  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
-  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
-  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
-  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="1f91fbd3d1269b0d5e70239a26e00195f0018f58"/>
-  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="4e1e20f508d5a4deff8854cc9f54251f1facad81"/>
-  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
-  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="1015c955c9c04a0282830e36d029dd46a1452c09"/>
-  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
-  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
-  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
-  <project name="platform/external/clearsilver" path="external/clearsilver" revision="4e7d837c51b575cdfc267e399159ebf185cefe2b"/>
-  <project name="platform/external/dbus" path="external/dbus" revision="f022f55d3ce46acf1fba3121642668c2b1262c72"/>
-  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
-  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="e17deb5139e6d1fe04be90edbed7f061e8da3ab0"/>
-  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
-  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="8bc4f69c082b6202f4ad25df0819dd2c61b84292"/>
-  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
-  <project name="platform/external/elfcopy" path="external/elfcopy" revision="83a9e97f988380cb719825bcb054aa64455d7207"/>
-  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
-  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
-  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
-  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
-  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
-  <project name="platform/external/fdlibm" path="external/fdlibm" revision="26ea4299bba7c618fdf97624b39e33444410896d"/>
-  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
-  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="477904934945ff04029cfa26a9030a908fbdb2d2"/>
-  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
-  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
-  <project name="platform/external/grub" path="external/grub" revision="3df932be86571f448249168828255c9fadaad76e"/>
-  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
-  <project name="platform/external/guava" path="external/guava" revision="6c5bbdd3d9fdd0d74a6519a329708b406d5294c6"/>
-  <project name="platform/external/harfbuzz" path="external/harfbuzz" revision="ca4c6948f69f807967f91d0e995716dd0f421dc5"/>
-  <project name="platform/external/hyphenation" path="external/hyphenation" revision="2c8b0b3430ee6a9ee501e6cc7921f8790851c286"/>
-  <project name="platform/external/icu4c" path="external/icu4c" revision="fa7b84a26dd6c44cb0d219ef7b2f7e258219b616"/>
-  <project name="platform/external/iproute2" path="external/iproute2" revision="1a441f49ec87ef74b978d7ae17da2a9b2ca6e811"/>
-  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="17b44fbcb08bc68fad70eebdbab3b6a782e1ea10"/>
-  <project name="platform/external/iptables" path="external/iptables" revision="4a820b4c41de49482adce1a4e7424ca124b6b233"/>
-  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
-  <project name="platform/external/jhead" path="external/jhead" revision="c5a256626bd67390bab579f4e52f27bdd6ce5b7c"/>
-  <project name="platform/external/jpeg" path="external/jpeg" revision="46c05833c257ab46c42182cbb2ae359892d14443"/>
-  <project name="platform/external/jsilver" path="external/jsilver" revision="8024e81e2acd5252edd7b40df9f884df99997db5"/>
-  <project name="platform/external/jsr305" path="external/jsr305" revision="28fc4830fdc68db134783955cc9f54f32d35b0fd"/>
-  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
-  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8d2a0f75b5059f907ef4b0a3394f47baed88a2e8"/>
-  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
-  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
-  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="7825db42b02c4ad3426d258e1590b01f5547f06b"/>
-  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
-  <project name="platform/external/libpng" path="external/libpng" revision="7b81f64c8315ead539c7955fbc790e7596376119"/>
-  <project name="platform/external/libvpx" path="external/libvpx" revision="76e0247ec867fcc232fc79f21e9bf85d3c3a5a3f"/>
-  <project name="platform/external/libxml2" path="external/libxml2" revision="f2da8ef9b4e7243c19e295fed847fa897e8230d3"/>
-  <project name="platform/external/libxslt" path="external/libxslt" revision="d9120218522dc5da663e78996d0f042c0a62bc5e"/>
-  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
-  <project name="platform/external/netcat" path="external/netcat" revision="2b3431e2762434dff96ff279069e3796ef2d4333"/>
-  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
-  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
-  <project name="platform/external/nist-sip" path="external/nist-sip" revision="7a8671bc57b163ae8950a1876a4707c33790904b"/>
-  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
-  <project name="platform/external/openssl" path="external/openssl" revision="a9b845727b88fabf6bb163b677fd3745f4961c07"/>
-  <project name="platform/external/oprofile" path="external/oprofile" revision="c26010c3ef84ee69a148788e17c75d12d23fadbd"/>
-  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
-  <project name="platform/external/ppp" path="external/ppp" revision="b273b20c6052f14868d803040cc2d78b330358cb"/>
-  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
-  <project name="platform/external/protobuf" path="external/protobuf" revision="8d24c6add5f0a6640948afccd9976b64a04a8ed3"/>
-  <project name="platform/external/qemu" path="external/qemu" revision="b9697ca80a8403f2cc07de010511510fdaa87315"/>
-  <project name="platform/external/qemu-pc-bios" path="external/qemu-pc-bios" revision="930baf66aeb08c8c72fb5ab3194014d41bb18f94"/>
-  <project name="platform/external/quake" path="external/quake" revision="603564cc40b6ee217b8be31ea08cd14f02f44679"/>
-  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
-  <project name="platform/external/skia" path="external/skia" revision="352a8162a61f37dfee340fe3365c4f8566f0db19"/>
-  <project name="platform/external/sonivox" path="external/sonivox" revision="42196fd10398c7250af364c0563893d209c8cc15"/>
-  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
-  <project name="platform/external/sqlite" path="external/sqlite" revision="0255261244c020a651cf08edee541d4118e7f84d"/>
-  <project name="platform/external/srec" path="external/srec" revision="d2aa1305744ec45eec732eb535dae4d42820a3f8"/>
-  <project name="platform/external/stlport" path="external/stlport" revision="534b7341a1d4b2972d373e5d5f10452b245a6c50"/>
-  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
-  <project name="platform/external/svox" path="external/svox" revision="baadee213d3350ab18fbd0c22a3ac3a65a853a4c"/>
-  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
-  <project name="platform/external/tcpdump" path="external/tcpdump" revision="532b8f38c144da9a298260a5d8978ab9e8e3856c"/>
-  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
-  <project name="platform/external/tremolo" path="external/tremolo" revision="ef03ae17fcbd7474f839cc2fee27a58369cf41dd"/>
-  <project name="platform/external/v8" path="external/v8" revision="df5bff59602802b769e994b0dc1d8869a27fa40c"/>
-  <project name="platform/external/webkit" path="external/webkit" revision="80aad5eedfe9e84cabb8540f818f7d1971ecadc3"/>
-  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
-  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
-  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
-  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
-  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="87d86044c0f15ae2ffc0350271c76ff874fb413b"/>
-  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
-  <project name="platform/frameworks/opt/carddav" path="frameworks/opt/carddav" revision="f08aa2df132dd8dc32a0013d3750137d9dd9280a"/>
-  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="49f8fa5f480ae382f9087fde333b50072b214ad2"/>
-  <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="e471b83f1c2d3982fae0307f37c1ca30ca7e6837"/>
-  <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="d1be1d02135917497866526ce12ef4c2548e63cb"/>
-  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="ef6b8ea3f664254958491f48fbe38c502d1129df"/>
-  <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="39c0d4c031d479a679900cb540253f42747cb810"/>
-  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="a162c4351926285892214b0726aaf07f0631dc72"/>
-  <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="36fb5888a17a2d1ca69c7c2e2d378127f354153b"/>
-  <project name="platform/hardware/ril" path="hardware/ril" revision="8dbc643bbc65d89c1fac69f09d02d8ff12b008fb"/>
-  <project name="platform/hardware/ti/omap3" path="hardware/ti/omap3" revision="5e6ec733aa694cae952e2e983a04c81a879d9824"/>
-  <project name="platform/hardware/ti/wlan" path="hardware/ti/wlan" revision="b2108e34759a48a52752e188fbff5a201d45c6b1"/>
-  <project name="platform/libcore" path="libcore" revision="cb6cd4609ea81a1288a5c754a2a42d6ce7acb842"/>
-  <project name="platform/ndk" path="ndk" revision="0378812e52338ad63930634989e3dda448353843"/>
-  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="7fff55adfd79efd30f2681d66b7cb60832ea3863"/>
-  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="4da2545c8543c7ba4729f63c86a38008309ec870"/>
-  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="18cbc618229f91b5d84a36dd7a95c2628b60da5e"/>
-  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
-  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="4176e8986e6dfc152e4b534e33355b01d3909fe5"/>
-  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="1b53b364907b94c9cb0ba22b486aec4bf1ba7a7a"/>
-  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="3e3fbce3f7cd5dacd661d48774d10979c47ec030"/>
-  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="823f1832d5643583456ac0b698e1936e9d857e19"/>
-  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="1ed367c40df8a2ce2268527e182bbb73af07f217"/>
-  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="a5c3744a247e432acf9f571a9dfb55321c4baa1a"/>
-  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
-  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="e62abe9385121cb91abea389bd08924a1c0ce25e"/>
-  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="63fff9c758991e7753431297d169bd61db8e1dd6"/>
-  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="b879135b9b4b0ba5f2496effe80b3f04f83740e5"/>
-  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="8ad8c48c96bf04a448025dfcd6c5c6e62f0a7fc5"/>
-  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="03fbe7dfb76315abf0abf76cdb33d643f4f595dc"/>
-  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="543b1768a231bd05cdb679262868df625a00522f"/>
-  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
-  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="3243c54292d85a330094fb369fc835f3ea0e8337"/>
-  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="782dd9a8629e5debab2b5388cd2c04e8a7333301"/>
-  <project name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="f31b933a8aebf07e3feb512ac650c5691c8c5e0f"/>
-  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="69b37278dd9a3c374c179a8c5ebeb518f0dcea39"/>
-  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="643e48b7fd1f1be62ac4bedc1051c00be129006b"/>
-  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="b67bae5b38b919cb113321ff0fc55b52c5a924fc"/>
-  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
-  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d5ee8b86837a5db0a4d2d20f7eafc6fc85e3e25c"/>
-  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="478eadc756466cc8438f0ba1db8e229fcd3a087a"/>
-  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="2e9083178a7bb9b761c94c5f510b1cbdf7f52894"/>
-  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
-  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="72e9cd105cb41c67446cec2933f91ea1da63493a"/>
-  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
-  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="f0b45dc1745cdd5530f693fcceb12c18846a01f5"/>
-  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="284d98dded9a12a06552cc987203878f313647e4"/>
-  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="efa03998f48e2d835b3c10c26f26e9fdec0d9c32"/>
-  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
-  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="4766c7f407e5cff4b53b5272bbb391e823630d5f"/>
-  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="3eba77e06203dc03e496185aa1b08cf9b28e187b"/>
-  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
-  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="1b09bd5a7871b104a57debcf9906ed0e4514f1bb"/>
-  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="951e9a05ee8af86a7e0a5a5157a8baedbc8d4edf"/>
-  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
-  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="9f6c08d658bda9adb2842b0a9dd650fc2b4f6821"/>
-  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
-  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
-  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6288e9d26943ced780fe8339ad9ec2bdbd5fa53d"/>
-  <project name="platform/prebuilt" path="prebuilt" revision="01a3c4765304b296e16c7a0a5f1d1b1666621c6e"/>
-  <project name="platform/sdk" path="sdk" revision="32bd23d6d93e568385c2da7e0a7f692724ac8f23"/>
-  <project name="platform/system/bluetooth" path="system/bluetooth" revision="596d8cae44844161b5b182d3defa681e1200dd46"/>
-  <project name="platform/system/core" path="system/core" revision="fe6bfb1285f8c784e0700d03f0f3657ba126e6c4"/>
-  <project name="platform/system/extras" path="system/extras" revision="880071e1ac4d35035fa30ddd992b81360408074b"/>
-  <project name="platform/system/media" path="system/media" revision="04f8400dae4e9c26e8e6bdf707513304cd5bc5df"/>
-  <project name="platform/system/netd" path="system/netd" revision="d1aed628997033076580580db381eaee0a3d29df"/>
-  <project name="platform/system/vold" path="system/vold" revision="9cb6e501f17ec2a511d942c833ea51a53bcd7249"/>
-  <project name="platform/system/wlan/ti" path="system/wlan/ti" revision="3baca6cc248e0d9a852c25b214c92bc856ae03ea"/>
-  <project name="platform/tools/tradefederation" path="tools/tradefederation" revision="550704434c1e3c81ccd6e9c9e06bbee0f202ca07"/>
-</manifest>
diff --git a/base-for-3.2-gpl.xml b/base-for-3.2-gpl.xml
deleted file mode 100644
index 2cf2cac..0000000
--- a/base-for-3.2-gpl.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <remote  name="aosp"
-           fetch=".." />
-  <default revision="master"
-           remote="aosp"
-           sync-j="4" />
-
-  <project name="device/common" revision="523e077fb8fe899680c33539155d935e0624e40a"/>
-  <project name="device/google/accessory/arduino" revision="1cc19a7049e14898425e9f1cd53153d268094706"/>
-  <project name="device/google/accessory/demokit" revision="c91d5884056b4a13f7f990aebf62f6c698856fea"/>
-  <project name="device/htc/common" revision="4d8a1179833237be6871f7663c77cc3c50b25ff6"/>
-  <project name="device/htc/passion" revision="8aff9eacadb815373dd3d9bc8ed04527846df715"/>
-  <project name="device/htc/passion-common" revision="b82f06616db76bfd3cae78c5b33a75c9a0c5192e"/>
-  <project name="device/sample" revision="6a57249bc3e56530ae5dc4d61d536ec23e578331"/>
-  <project name="device/samsung/crespo" revision="1f6fcbdedb2696c072a8f3f04c24796917d81e92"/>
-  <project name="device/samsung/crespo4g" revision="637e75176132ce98d379a2325491e3d5dbef5cda"/>
-  <project name="platform/bionic" path="bionic" revision="57aadbb096a118dd33f9f16c67bd18dbb6b92c4a"/>
-  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
-  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="b354f6abda00461eae4cb0215faa8b5a7268e275"/>
-  <project name="platform/bootable/recovery" path="bootable/recovery" revision="8d58c957036835db148acc4e506633a016dc6c7e"/>
-  <project name="platform/build" path="build" revision="b399f5e81e2a644776f163e499df5bd0a38fe272">
-    <copyfile dest="Makefile" src="core/root.mk"/>
-  </project>
-  <project name="platform/cts" path="cts" revision="9c051c782b966c15dfebe2349336d89bb217c0f8"/>
-  <project name="platform/dalvik" path="dalvik" revision="03c60a44861951126affa75ba8ee4233c136fe92"/>
-  <project name="platform/development" path="development" revision="3e51ea6b5baab25504af27db712d2f245333242d"/>
-  <project name="platform/docs/source.android.com" path="docs/source.android.com" revision="8ea9d7a6ca3eadd182f2475014ad28994064f36b"/>
-  <project name="platform/external/apache-http" path="external/apache-http" revision="00efe680b4cc6e9849cb270058ac5967af92ffef"/>
-  <project name="platform/external/apache-qp" path="external/apache-qp" revision="64ea622b23e6612eb8e7dcae6bfd4314beb022a8"/>
-  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
-  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
-  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
-  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="0bb87fe9091f5e629f8f104c5d9547bbdf519aa0"/>
-  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="4e1e20f508d5a4deff8854cc9f54251f1facad81"/>
-  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
-  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="1015c955c9c04a0282830e36d029dd46a1452c09"/>
-  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
-  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
-  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
-  <project name="platform/external/clearsilver" path="external/clearsilver" revision="5db8e26dd61139e7a0c6009f7ed7bf4a767d7509"/>
-  <project name="platform/external/dbus" path="external/dbus" revision="f022f55d3ce46acf1fba3121642668c2b1262c72"/>
-  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
-  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="e17deb5139e6d1fe04be90edbed7f061e8da3ab0"/>
-  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
-  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="8bc4f69c082b6202f4ad25df0819dd2c61b84292"/>
-  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
-  <project name="platform/external/elfcopy" path="external/elfcopy" revision="83a9e97f988380cb719825bcb054aa64455d7207"/>
-  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
-  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
-  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
-  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
-  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
-  <project name="platform/external/fdlibm" path="external/fdlibm" revision="26ea4299bba7c618fdf97624b39e33444410896d"/>
-  <project name="platform/external/freetype" path="external/freetype" revision="0c30ba1342318e73197db7dd52dcca4b6d4bf06d"/>
-  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="477904934945ff04029cfa26a9030a908fbdb2d2"/>
-  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
-  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
-  <project name="platform/external/grub" path="external/grub" revision="3df932be86571f448249168828255c9fadaad76e"/>
-  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
-  <project name="platform/external/guava" path="external/guava" revision="6c5bbdd3d9fdd0d74a6519a329708b406d5294c6"/>
-  <project name="platform/external/harfbuzz" path="external/harfbuzz" revision="ca4c6948f69f807967f91d0e995716dd0f421dc5"/>
-  <project name="platform/external/hyphenation" path="external/hyphenation" revision="2c8b0b3430ee6a9ee501e6cc7921f8790851c286"/>
-  <project name="platform/external/icu4c" path="external/icu4c" revision="fa7b84a26dd6c44cb0d219ef7b2f7e258219b616"/>
-  <project name="platform/external/iproute2" path="external/iproute2" revision="1a441f49ec87ef74b978d7ae17da2a9b2ca6e811"/>
-  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="237da7058bb0e22cf117766435dd5e578c16e4ef"/>
-  <project name="platform/external/iptables" path="external/iptables" revision="4a820b4c41de49482adce1a4e7424ca124b6b233"/>
-  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
-  <project name="platform/external/jhead" path="external/jhead" revision="e5617a0c5cc0b7cdd9531db348a929263b466d00"/>
-  <project name="platform/external/jpeg" path="external/jpeg" revision="46c05833c257ab46c42182cbb2ae359892d14443"/>
-  <project name="platform/external/jsilver" path="external/jsilver" revision="8024e81e2acd5252edd7b40df9f884df99997db5"/>
-  <project name="platform/external/jsr305" path="external/jsr305" revision="28fc4830fdc68db134783955cc9f54f32d35b0fd"/>
-  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
-  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8d2a0f75b5059f907ef4b0a3394f47baed88a2e8"/>
-  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
-  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
-  <project name="platform/external/libmtp" path="external/libmtp" revision="3aa430dc5437a98734b36f996f9b17081a589143"/>
-  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="80c2d4090d6292a3fd2e20a18a981bc19e0a0429"/>
-  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
-  <project name="platform/external/libpng" path="external/libpng" revision="7b81f64c8315ead539c7955fbc790e7596376119"/>
-  <project name="platform/external/libusb" path="external/libusb" revision="bda86ae8203fd360c4e87c310498da1e1e4c53a7"/>
-  <project name="platform/external/libusb-compat" path="external/libusb-compat" revision="e9a683104ef3f40d38459c0ca62a2d46f20b0714"/>
-  <project name="platform/external/libvpx" path="external/libvpx" revision="76e0247ec867fcc232fc79f21e9bf85d3c3a5a3f"/>
-  <project name="platform/external/libxml2" path="external/libxml2" revision="f2da8ef9b4e7243c19e295fed847fa897e8230d3"/>
-  <project name="platform/external/libxslt" path="external/libxslt" revision="d9120218522dc5da663e78996d0f042c0a62bc5e"/>
-  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
-  <project name="platform/external/netcat" path="external/netcat" revision="2b3431e2762434dff96ff279069e3796ef2d4333"/>
-  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
-  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
-  <project name="platform/external/nist-sip" path="external/nist-sip" revision="7a8671bc57b163ae8950a1876a4707c33790904b"/>
-  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
-  <project name="platform/external/openssl" path="external/openssl" revision="a9b845727b88fabf6bb163b677fd3745f4961c07"/>
-  <project name="platform/external/oprofile" path="external/oprofile" revision="c26010c3ef84ee69a148788e17c75d12d23fadbd"/>
-  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
-  <project name="platform/external/ppp" path="external/ppp" revision="b273b20c6052f14868d803040cc2d78b330358cb"/>
-  <project name="platform/external/proguard" path="external/proguard" revision="d889ce6df1a831f4cff915b4c2a48090ece14b03"/>
-  <project name="platform/external/protobuf" path="external/protobuf" revision="8d24c6add5f0a6640948afccd9976b64a04a8ed3"/>
-  <project name="platform/external/qemu" path="external/qemu" revision="44ce50f294d25e15a7b26bbca96d0540724abd9b"/>
-  <project name="platform/external/qemu-pc-bios" path="external/qemu-pc-bios" revision="fa6aa17e769bebf8d1691605d1d34d12b994137b"/>
-  <project name="platform/external/quake" path="external/quake" revision="603564cc40b6ee217b8be31ea08cd14f02f44679"/>
-  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
-  <project name="platform/external/skia" path="external/skia" revision="cd3762b406d94951a2372e1c08b0f5e3afe8531a"/>
-  <project name="platform/external/sonivox" path="external/sonivox" revision="42196fd10398c7250af364c0563893d209c8cc15"/>
-  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
-  <project name="platform/external/sqlite" path="external/sqlite" revision="0255261244c020a651cf08edee541d4118e7f84d"/>
-  <project name="platform/external/srec" path="external/srec" revision="d2aa1305744ec45eec732eb535dae4d42820a3f8"/>
-  <project name="platform/external/stlport" path="external/stlport" revision="534b7341a1d4b2972d373e5d5f10452b245a6c50"/>
-  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
-  <project name="platform/external/svox" path="external/svox" revision="baadee213d3350ab18fbd0c22a3ac3a65a853a4c"/>
-  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
-  <project name="platform/external/tcpdump" path="external/tcpdump" revision="532b8f38c144da9a298260a5d8978ab9e8e3856c"/>
-  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
-  <project name="platform/external/tremolo" path="external/tremolo" revision="ef03ae17fcbd7474f839cc2fee27a58369cf41dd"/>
-  <project name="platform/external/v8" path="external/v8" revision="df5bff59602802b769e994b0dc1d8869a27fa40c"/>
-  <project name="platform/external/valgrind" path="external/valgrind" revision="77dd9287e67de80c79fd71f2c1df9386ea0fa5b7"/>
-  <project name="platform/external/webkit" path="external/webkit" revision="96b3138148c51cb4ad4bddca665fc528677dd182"/>
-  <project name="platform/external/webp" path="external/webp" revision="b760a2615c614554d4ab2961aa4671d9b382c949"/>
-  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
-  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
-  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
-  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
-  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="38bb0123b8b9857c3119fd359739daf872f619d6"/>
-  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
-  <project name="platform/frameworks/opt/carddav" path="frameworks/opt/carddav" revision="f08aa2df132dd8dc32a0013d3750137d9dd9280a"/>
-  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="49f8fa5f480ae382f9087fde333b50072b214ad2"/>
-  <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="e471b83f1c2d3982fae0307f37c1ca30ca7e6837"/>
-  <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="910cf83c9a58e4ee42b6aea919de80273cb25aa4"/>
-  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="ef6b8ea3f664254958491f48fbe38c502d1129df"/>
-  <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="39c0d4c031d479a679900cb540253f42747cb810"/>
-  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="a162c4351926285892214b0726aaf07f0631dc72"/>
-  <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="36fb5888a17a2d1ca69c7c2e2d378127f354153b"/>
-  <project name="platform/hardware/ril" path="hardware/ril" revision="8dbc643bbc65d89c1fac69f09d02d8ff12b008fb"/>
-  <project name="platform/hardware/ti/omap3" path="hardware/ti/omap3" revision="5e6ec733aa694cae952e2e983a04c81a879d9824"/>
-  <project name="platform/hardware/ti/wlan" path="hardware/ti/wlan" revision="b2108e34759a48a52752e188fbff5a201d45c6b1"/>
-  <project name="platform/libcore" path="libcore" revision="08fe90bf2642cc62a57f8d211254a15052f9185e"/>
-  <project name="platform/ndk" path="ndk" revision="5411a8a4aa5772dca9bb9156d8d3cdc45b7dc3dd"/>
-  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="7fff55adfd79efd30f2681d66b7cb60832ea3863"/>
-  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="4f97a7a93ae52589b63fd15d2596549b5a084ca8"/>
-  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="18cbc618229f91b5d84a36dd7a95c2628b60da5e"/>
-  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
-  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="4176e8986e6dfc152e4b534e33355b01d3909fe5"/>
-  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="4b478c9940ad3e79f1c99ad70b2aa7b4643b3946"/>
-  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="3e3fbce3f7cd5dacd661d48774d10979c47ec030"/>
-  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="823f1832d5643583456ac0b698e1936e9d857e19"/>
-  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="1ed367c40df8a2ce2268527e182bbb73af07f217"/>
-  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="a5c3744a247e432acf9f571a9dfb55321c4baa1a"/>
-  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
-  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="1b7f000b86ab01dc72e4ac3e7aa877b604aebe56"/>
-  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="63fff9c758991e7753431297d169bd61db8e1dd6"/>
-  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="b879135b9b4b0ba5f2496effe80b3f04f83740e5"/>
-  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="8ad8c48c96bf04a448025dfcd6c5c6e62f0a7fc5"/>
-  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="03fbe7dfb76315abf0abf76cdb33d643f4f595dc"/>
-  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="543b1768a231bd05cdb679262868df625a00522f"/>
-  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
-  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="991cfe3ac99671f098a0878d83cb928c4e98449d"/>
-  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="782dd9a8629e5debab2b5388cd2c04e8a7333301"/>
-  <project name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="f31b933a8aebf07e3feb512ac650c5691c8c5e0f"/>
-  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="69b37278dd9a3c374c179a8c5ebeb518f0dcea39"/>
-  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="643e48b7fd1f1be62ac4bedc1051c00be129006b"/>
-  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
-  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="b67bae5b38b919cb113321ff0fc55b52c5a924fc"/>
-  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
-  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d5ee8b86837a5db0a4d2d20f7eafc6fc85e3e25c"/>
-  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="478eadc756466cc8438f0ba1db8e229fcd3a087a"/>
-  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="2e9083178a7bb9b761c94c5f510b1cbdf7f52894"/>
-  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
-  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="72e9cd105cb41c67446cec2933f91ea1da63493a"/>
-  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
-  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="f0b45dc1745cdd5530f693fcceb12c18846a01f5"/>
-  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="284d98dded9a12a06552cc987203878f313647e4"/>
-  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="efa03998f48e2d835b3c10c26f26e9fdec0d9c32"/>
-  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
-  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="4766c7f407e5cff4b53b5272bbb391e823630d5f"/>
-  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="3eba77e06203dc03e496185aa1b08cf9b28e187b"/>
-  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
-  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="1b09bd5a7871b104a57debcf9906ed0e4514f1bb"/>
-  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="951e9a05ee8af86a7e0a5a5157a8baedbc8d4edf"/>
-  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
-  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="9f6c08d658bda9adb2842b0a9dd650fc2b4f6821"/>
-  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
-  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
-  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6288e9d26943ced780fe8339ad9ec2bdbd5fa53d"/>
-  <project name="platform/prebuilt" path="prebuilt" revision="364ed97865c182c14db665a41bb5db689f643656"/>
-  <project name="platform/sdk" path="sdk" revision="5a7dfe7f7526aad898e2b6c43146fb79ef30b34c"/>
-  <project name="platform/system/bluetooth" path="system/bluetooth" revision="2f4c1c9823a5d28580f4a06dec405f26bb7d22c5"/>
-  <project name="platform/system/core" path="system/core" revision="14c2823a631b444687b9d26b7baf4c864091c07b"/>
-  <project name="platform/system/extras" path="system/extras" revision="880071e1ac4d35035fa30ddd992b81360408074b"/>
-  <project name="platform/system/media" path="system/media" revision="04f8400dae4e9c26e8e6bdf707513304cd5bc5df"/>
-  <project name="platform/system/netd" path="system/netd" revision="d41806cb55874d0eaf82fe11ffc62cf50a227313"/>
-  <project name="platform/system/vold" path="system/vold" revision="2c9d8de79a0dd7f894c65777a197c86486aff96c"/>
-  <project name="platform/system/wlan/ti" path="system/wlan/ti" revision="3baca6cc248e0d9a852c25b214c92bc856ae03ea"/>
-  <project name="platform/tools/tradefederation" path="tools/tradefederation" revision="550704434c1e3c81ccd6e9c9e06bbee0f202ca07"/>
-</manifest>
diff --git a/default.xml b/default.xml
index c8769eb..d65dab6 100644
--- a/default.xml
+++ b/default.xml
@@ -19,7 +19,10 @@
   <project path="cts" name="platform/cts" />
   <project path="dalvik" name="platform/dalvik" />
   <project path="development" name="platform/development" />
+  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
+  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
+  <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/goldfish" name="device/generic/goldfish" />
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
@@ -35,6 +38,7 @@
   <project path="device/samsung/tuna" name="device/samsung/tuna" />
   <project path="device/ti/panda" name="device/ti/panda" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
+  <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
   <project path="external/android-mock" name="platform/external/android-mock" />
   <project path="external/ant-glob" name="platform/external/ant-glob" />
@@ -55,9 +59,11 @@
   <project path="external/checkpolicy" name="platform/external/checkpolicy" />
   <project path="external/chromium" name="platform/external/chromium" />
   <project path="external/chromium-trace" name="platform/external/chromium-trace" />
+  <project path="external/cibu-fonts" name="platform/external/cibu-fonts" />
   <project path="external/clang" name="platform/external/clang" />
-  <project path="external/collada" name="platform/external/collada" />
+  <project path="external/compiler-rt" name="platform/external/compiler-rt" />
   <project path="external/dbus" name="platform/external/dbus" />
+  <project path="external/dexmaker" name="platform/external/dexmaker" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/doclava" name="platform/external/doclava" />
@@ -76,22 +82,28 @@
   <project path="external/flac" name="platform/external/flac" />
   <project path="external/freetype" name="platform/external/freetype" />
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
+  <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" />
+  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" />
   <project path="external/genext2fs" name="platform/external/genext2fs" />
   <project path="external/giflib" name="platform/external/giflib" />
   <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" />
   <project path="external/grub" name="platform/external/grub" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project path="external/guava" name="platform/external/guava" />
+  <project path="external/hamcrest" name="platform/external/hamcrest" />
   <project path="external/harfbuzz" name="platform/external/harfbuzz" />
   <project path="external/hyphenation" name="platform/external/hyphenation" />
   <project path="external/icu4c" name="platform/external/icu4c" />
   <project path="external/iproute2" name="platform/external/iproute2" />
   <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
   <project path="external/iptables" name="platform/external/iptables" />
+  <project path="external/jack" name="platform/external/jack" />
   <project path="external/javasqlite" name="platform/external/javasqlite" />
   <project path="external/javassist" name="platform/external/javassist" />
   <project path="external/jdiff" name="platform/external/jdiff" />
   <project path="external/jhead" name="platform/external/jhead" />
+  <project path="external/jmdns" name="platform/external/jmdns" />
+  <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" />
   <project path="external/jpeg" name="platform/external/jpeg" />
   <project path="external/jsilver" name="platform/external/jsilver" />
   <project path="external/jsr305" name="platform/external/jsr305" />
@@ -114,22 +126,27 @@
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/libyuv" name="platform/external/libyuv" />
+  <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" />
+  <project path="external/littlemock" name="platform/external/littlemock" />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
   <project path="external/markdown" name="platform/external/markdown" />
+  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
   <project path="external/mesa3d" name="platform/external/mesa3d" />
   <project path="external/mksh" name="platform/external/mksh" />
   <project path="external/mockwebserver" name="platform/external/mockwebserver" />
   <project path="external/mtpd" name="platform/external/mtpd" />
+  <project path="external/naver-fonts" name="platform/external/naver-fonts" />
   <project path="external/netcat" name="platform/external/netcat" />
   <project path="external/netperf" name="platform/external/netperf" />
   <project path="external/neven" name="platform/external/neven" />
   <project path="external/nist-sip" name="platform/external/nist-sip" />
   <project path="external/oauth" name="platform/external/oauth" />
   <project path="external/opencv" name="platform/external/opencv" />
+  <project path="external/openfst" name="platform/external/openfst" />
+  <project path="external/openssh" name="platform/external/openssh" />
   <project path="external/openssl" name="platform/external/openssl" />
   <project path="external/oprofile" name="platform/external/oprofile" />
-  <project path="external/pcre" name="platform/external/pcre" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/ppp" name="platform/external/ppp" />
@@ -138,10 +155,12 @@
   <project path="external/qemu" name="platform/external/qemu" />
   <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" />
   <project path="external/quake" name="platform/external/quake" />
+  <project path="external/regex-re2" name="platform/external/regex-re2" />
   <project path="external/replicaisland" name="platform/external/replicaisland" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
   <project path="external/sepolicy" name="platform/external/sepolicy" />
   <project path="external/skia" name="platform/external/skia" />
+  <project path="external/smali" name="platform/external/smali" />
   <project path="external/sonivox" name="platform/external/sonivox" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
@@ -149,6 +168,7 @@
   <project path="external/srtp" name="platform/external/srtp" />
   <project path="external/stlport" name="platform/external/stlport" />
   <project path="external/strace" name="platform/external/strace" />
+  <project path="external/stressapptest" name="platform/external/stressapptest" />
   <project path="external/svox" name="platform/external/svox" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
@@ -160,25 +180,35 @@
   <project path="external/webkit" name="platform/external/webkit" />
   <project path="external/webp" name="platform/external/webp" />
   <project path="external/webrtc" name="platform/external/webrtc" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
+  <project path="external/zxing" name="platform/external/zxing" />
+  <project path="frameworks/av" name="platform/frameworks/av" />
   <project path="frameworks/base" name="platform/frameworks/base" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
+  <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
+  <project path="frameworks/mff" name="platform/frameworks/mff" />
+  <project path="frameworks/ml" name="platform/frameworks/ml" />
+  <project path="frameworks/native" name="platform/frameworks/native" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
   <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" />
   <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" />
+  <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" />
+  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" />
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
+  <project path="frameworks/rs" name="platform/frameworks/rs" />
   <project path="frameworks/support" name="platform/frameworks/support" />
+  <project path="frameworks/testing" name="platform/frameworks/testing" />
+  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" />
+  <project path="gdk" name="platform/gdk" />
   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
   <project path="hardware/invensense" name="platform/hardware/invensense" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" />
@@ -192,6 +222,7 @@
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libcore" name="platform/libcore" />
+  <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
   <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
@@ -210,6 +241,7 @@
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
   <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
   <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
+  <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
   <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
   <project path="packages/apps/Music" name="platform/packages/apps/Music" />
   <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
@@ -237,8 +269,8 @@
   <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" />
   <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" />
   <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" />
-  <project path="packages/providers/GoogleContactsProvider" name="platform/packages/providers/GoogleContactsProvider" />
   <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" />
+  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" />
   <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" />
   <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" />
   <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" />
@@ -249,20 +281,25 @@
   <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
   <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" />
   <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" />
-  <project path="prebuilt" name="platform/prebuilt" />
+  <project path="pdk" name="platform/pdk" />
   <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" />
   <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" />
   <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.4.3" />
   <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" />
   <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" />
   <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" />
   <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" />
   <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.4.3" />
   <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" />
   <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" />
   <project path="prebuilts/misc" name="platform/prebuilts/misc" />
+  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" />
   <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" />
+  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" />
   <project path="prebuilts/tools" name="platform/prebuilts/tools" />
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
@@ -270,6 +307,7 @@
   <project path="system/extras" name="platform/system/extras" />
   <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
+  <project path="system/security" name="platform/system/security" />
   <project path="system/vold" name="platform/system/vold" />
 
 </manifest>