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/base-for-4.2-gpl.xml b/base-for-4.2-gpl.xml
deleted file mode 100644
index 35ddf2f..0000000
--- a/base-for-4.2-gpl.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="device" name="device/asus/grouper" revision="7fce7d56cb077e869b9509cd2770d92e8cf29dcc" upstream="master"/>
-  <project name="device/common" revision="c5adba2e2ae6024010d7e4b4bc622df630b484da" upstream="master"/>
-  <project name="device/generic/armv7-a" revision="7292d238e9a288fab21ac3da685d49f46ca02105" upstream="master"/>
-  <project name="device/generic/armv7-a-neon" revision="e19746d025358e37cb78f971946a54f8afb3902a" upstream="master"/>
-  <project name="device/generic/goldfish" revision="f0397b68bd158c97f8c83ad7c299f8962d6c885e" upstream="master"/>
-  <project groups="device" name="device/google/accessory/arduino" revision="abc5159a3ca9dbb5c7e364a1eab99901a4440ac5" upstream="master"/>
-  <project groups="device" name="device/google/accessory/demokit" revision="7dfe7f89a3b174709c773fe319531006e46440d9" upstream="master"/>
-  <project groups="device" name="device/google/phantasm" revision="1a6da1507b078f8de298c53e4be62cbd3f8c92ba" upstream="master"/>
-  <project groups="device" name="device/moto/common" revision="88f2f2b4fcf01b3e3a2d9dcaf6e03449865ea251" upstream="master"/>
-  <project groups="device" name="device/moto/stingray" revision="837644c70c8b4f3523056b03a14c4038adfc9d30" upstream="master"/>
-  <project groups="device" name="device/moto/wingray" revision="cd99e82095d2f2a82a9f1f157d6dc46aa37a39a8" upstream="master"/>
-  <project name="device/sample" revision="547672178798b2e46299b8bb6497b350b0c0903e" upstream="master"/>
-  <project groups="device" name="device/samsung/crespo" revision="6294a2f61517b2220ba0fb18f26aa7747555f7de" upstream="master"/>
-  <project groups="device" name="device/samsung/crespo4g" revision="0b4c4098df526cae62bf9a03ef31ffcbd1c5376c" upstream="master"/>
-  <project groups="device" name="device/samsung/maguro" revision="0f2c53e45841fd3f2ef3a5a26a4525392b3d4a58" upstream="master"/>
-  <project groups="device" name="device/samsung/toro" revision="a735e3fa56ad70fc00f112e1fb76ed7ee950d805" upstream="master"/>
-  <project groups="device" name="device/samsung/toroplus" revision="4e8ba13e1ba1a8876b254def2c889b507332b608" upstream="master"/>
-  <project groups="device" name="device/samsung/tuna" revision="5897310688b2d325dc2e437f6f3811e298b21810" upstream="master"/>
-  <project groups="device" name="device/sony/lt26" revision="ef1348f838a0e09c36a1f378a7f80e006dd62cbb" upstream="master"/>
-  <project groups="device" name="device/ti/panda" revision="5f567f13b76dc6b2e1bfe3d279fbac0427704a09" upstream="master"/>
-  <project name="platform/abi/cpp" path="abi/cpp" revision="eb789ea833d8d800662b67914d9c1785a58c2caa" upstream="master"/>
-  <project name="platform/bionic" path="bionic" revision="c0ac7eba934fb88f321c75a71312ea482e9a85e9" upstream="master"/>
-  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="b1fde5cd7d5158b8e6876139ca76a341d0e49708" upstream="master"/>
-  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="60d078a5924284a452a8fe739247704f8b31c754" upstream="master"/>
-  <project name="platform/bootable/recovery" path="bootable/recovery" revision="78afed1c15989d4aa7e66094afa81cd3a6d22674" upstream="master"/>
-  <project name="platform/build" path="build" revision="a281e6a9c3e9ee2b38e38014324bf58ae1dff9a2" upstream="master">
-    <copyfile dest="Makefile" src="core/root.mk"/>
-  </project>
-  <project name="platform/cts" path="cts" revision="bef9f3cd397d9f643a6654a87582a72e03af852b" upstream="master"/>
-  <project name="platform/dalvik" path="dalvik" revision="2988c4f272f62af2e96f1e6161d4e99bc1dc1b16" upstream="master"/>
-  <project name="platform/development" path="development" revision="42d7eefb86bf9823f5563b6fa2a741b56cfcbe95" upstream="master"/>
-  <project name="platform/docs/source.android.com" path="docs/source.android.com" revision="9af1314e3c5077f4a439d40decacddbd0175aca5" upstream="master"/>
-  <project name="platform/external/aac" path="external/aac" revision="fef220869b4e5bf9241369d3379b389136c2f174" upstream="master"/>
-  <project name="platform/external/android-clat" path="external/android-clat" revision="62ea9b6658a4c2116eeb6450c8244269448e79aa" upstream="master"/>
-  <project name="platform/external/android-mock" path="external/android-mock" revision="1922306d33d16f143d5a01daebba4e2cb477d0f5" upstream="master"/>
-  <project name="platform/external/ant-glob" path="external/ant-glob" revision="0f189400fd2a36bf11bfb058e7f3917eb7ed163a" upstream="master"/>
-  <project name="platform/external/antlr" path="external/antlr" revision="324c4644fee44b9898524c09511bd33c3f12e2df" upstream="master"/>
-  <project name="platform/external/apache-harmony" path="external/apache-harmony" revision="7f15f17659ebca0757ce1c7fa3ecd7e8fe074324" upstream="master"/>
-  <project name="platform/external/apache-http" path="external/apache-http" revision="e6fe5ecbfb2977220a6f51ba4da7bd5f83d8d670" upstream="master"/>
-  <project name="platform/external/apache-qp" path="external/apache-qp" revision="64ea622b23e6612eb8e7dcae6bfd4314beb022a8" upstream="master"/>
-  <project name="platform/external/apache-xml" path="external/apache-xml" revision="74b8044dcd1208a1fc11ee9638584be74663c5a3" upstream="master"/>
-  <project name="platform/external/arduino" path="external/arduino" revision="d5790d78880d4bd60be277ee20e53a851aa8c116" upstream="master"/>
-  <project name="platform/external/astl" path="external/astl" revision="5c362d4573d8c852855e3d769c4add282a27f6d5" upstream="master"/>
-  <project name="platform/external/bison" path="external/bison" revision="4af3c477523bc96a5a535500a722cd563f1d486f" upstream="master"/>
-  <project name="platform/external/blktrace" path="external/blktrace" revision="55236cdbcee4e543d69e2c25dbf27c62301d760a" upstream="master"/>
-  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="47f813518b17fe9b2c215c6de82492474c1df897" upstream="master"/>
-  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="1143b9918eab068401b604eb11c3f651f4e38b25" upstream="master"/>
-  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="7322661808c2006b7848e79e6bb72b37fbcf6710" upstream="master"/>
-  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="5db429c3eb447595975a7466801318288eef7eda" upstream="master"/>
-  <project name="platform/external/bsdiff" path="external/bsdiff" revision="23e322ab19fb7d74c2c37e40ce364d9f709bdcee" upstream="master"/>
-  <project name="platform/external/bzip2" path="external/bzip2" revision="414a94a045a359ab76fa22feaee883180a9b2779" upstream="master"/>
-  <project name="platform/external/checkpolicy" path="external/checkpolicy" revision="ba8e9924f575e267f1503b7669fe3120d68d4e1f" upstream="master"/>
-  <project name="platform/external/chromium" path="external/chromium" revision="5dfd28055043f52c8089d2b26e101de1f66838c8" upstream="master"/>
-  <project name="platform/external/chromium-trace" path="external/chromium-trace" revision="c5eda7d032b6ea833d48f142ece05ba823ac46ce" upstream="master"/>
-  <project name="platform/external/cibu-fonts" path="external/cibu-fonts" revision="04031024425e067f6b0fdc40def6e04516c31c4f" upstream="master"/>
-  <project name="platform/external/clang" path="external/clang" revision="514cf309fe66c1f74baa041366bf9d162892de1a" upstream="master"/>
-  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="213fe1121889ea8a2c23f78f189d8f48a59dde3c" upstream="master"/>
-  <project name="platform/external/dbus" path="external/dbus" revision="537eaff5de9aace3348436166d4cde7adc1e488e" upstream="master"/>
-  <project name="platform/external/dexmaker" path="external/dexmaker" revision="7f8ba8eace1379fe45bad3adb91925be236c041d" upstream="master"/>
-  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="7a659da9ec67d85d1b166fc6c1984f488de8e031" upstream="master"/>
-  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="ad7502a6aeff431e9759e57734474576d4b085e7" upstream="master"/>
-  <project name="platform/external/doclava" path="external/doclava" revision="3c925b473212325cbf5f734cb5d1d57588ea83e3" upstream="master"/>
-  <project name="platform/external/dropbear" path="external/dropbear" revision="a34ddbe3819bc465968f3676c734b405e655f8b7" upstream="master"/>
-  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="5886dc5cdcccd3d09a208d41d8c23748c25a2a22" upstream="master"/>
-  <project name="platform/external/easymock" path="external/easymock" revision="c9a234086537e5fd820b110bbd99e3cdc695004c" upstream="master"/>
-  <project name="platform/external/eclipse-basebuilder" path="external/eclipse-basebuilder" revision="6134da6347cc997e0cf2921aaadfb46f21c05d85" upstream="master"/>
-  <project name="platform/external/eclipse-windowbuilder" path="external/eclipse-windowbuilder" revision="a5f3ee137e94737538ec3bdf9b3716765d178c17" upstream="master"/>
-  <project name="platform/external/elfutils" path="external/elfutils" revision="101941576c52a1270c9c2d63ea95d48729d6cf96" upstream="master"/>
-  <project name="platform/external/embunit" path="external/embunit" revision="336b7c65098af0d1be69f2db55f4e75342d73b3f" upstream="master"/>
-  <project name="platform/external/emma" path="external/emma" revision="77b9074f3d835682d66fe18e0768639745c34239" upstream="master"/>
-  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f" upstream="master"/>
-  <project name="platform/external/expat" path="external/expat" revision="7174719ff5f71e7fa1bc3af063905c92869c3b0e" upstream="master"/>
-  <project name="platform/external/eyes-free" path="external/eyes-free" revision="16bd4c7a4d1bfe229068b637614dad7c48dd2ceb" upstream="master"/>
-  <project name="platform/external/fat32lib" path="external/fat32lib" revision="0a6d8750c4330ad793f3beae670eb21e0e1d401b" upstream="master"/>
-  <project name="platform/external/fdlibm" path="external/fdlibm" revision="f0c0422e71b8752cc5a6b71f783f8f5a16f861cd" upstream="master"/>
-  <project name="platform/external/flac" path="external/flac" revision="686d6ff2afda2ea3211bec37ad0daa655c24e6d4" upstream="master"/>
-  <project name="platform/external/freetype" path="external/freetype" revision="41371e1e39c8528eb0c4bc40683c736e6683e60c" upstream="master"/>
-  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="ed86a9f77e796aa5923a5b2d1455a7739b86e60b" upstream="master"/>
-  <project name="platform/external/ganymed-ssh2" path="external/ganymed-ssh2" revision="d3724dabc1cfbacd105fe6c422b4dcba80e4fb2d" upstream="master"/>
-  <project name="platform/external/gcc-demangle" path="external/gcc-demangle" revision="caf5670525abbd6b98e11bb98c620932cf795624" upstream="master"/>
-  <project name="platform/external/genext2fs" path="external/genext2fs" revision="2e672fab1b8935ab6df5c2fc69386fe6b4ade873" upstream="master"/>
-  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb" upstream="master"/>
-  <project name="platform/external/google-diff-match-patch" path="external/google-diff-match-patch" revision="cecbe12841337860291c2d6a5728b681ec5fca2a" upstream="master"/>
-  <project name="platform/external/grub" path="external/grub" revision="5c3bee7defca81362e98cf8fbd6c20cf47dff00b" upstream="master"/>
-  <project name="platform/external/gtest" path="external/gtest" revision="85030ffa1dd68c0cc05e9115430f28627996e019" upstream="master"/>
-  <project name="platform/external/guava" path="external/guava" revision="515370823799decea74751ff3a78b80e44e71219" upstream="master"/>
-  <project name="platform/external/hamcrest" path="external/hamcrest" revision="1e0972dccb32b15511bd87c40d47cfe3b8bc0624" upstream="master"/>
-  <project name="platform/external/harfbuzz" path="external/harfbuzz" revision="580c68b86c79b455bdae828456ff68e89137eeef" upstream="master"/>
-  <project name="platform/external/hyphenation" path="external/hyphenation" revision="bfa84834dfeb7fe8d058c2e7e07b5981451ddf82" upstream="master"/>
-  <project name="platform/external/icu4c" path="external/icu4c" revision="28f7510d57a1cf90484b0b364b2fca8a596f2f07" upstream="master"/>
-  <project name="platform/external/iproute2" path="external/iproute2" revision="f145162f3afe38720a6b53d77d453a7b2365703f" upstream="master"/>
-  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="adfbc90a9f63d1e0c87b4b17689c07cd3c781a0e" upstream="master"/>
-  <project name="platform/external/iptables" path="external/iptables" revision="e07e0d31f48d951e0f03ba254d4754810732c241" upstream="master"/>
-  <project name="platform/external/jack" path="external/jack" revision="5ceb2025ac5d25ed48183ac2d3dac4691fe761fb" upstream="master"/>
-  <project name="platform/external/javasqlite" path="external/javasqlite" revision="c508dc69793e188873a46e8dff480264dad7eb83" upstream="master"/>
-  <project name="platform/external/javassist" path="external/javassist" revision="9566207cff5871c672fac1f0d4332d93292036d7" upstream="master"/>
-  <project name="platform/external/jdiff" path="external/jdiff" revision="e4694302d6a3786c64d954e0b3cf42786283bd3c" upstream="master"/>
-  <project name="platform/external/jhead" path="external/jhead" revision="1b5ecdc7bb55511066c0c05395035f3a816e82b6" upstream="master"/>
-  <project name="platform/external/jmdns" path="external/jmdns" revision="f4eb7466d5c09098f9dc54137ed3235e3c43fc9f" upstream="master"/>
-  <project name="platform/external/jmonkeyengine" path="external/jmonkeyengine" revision="a6b44658eb1c55295f132a36233a11aa2bd8f9cf" upstream="master"/>
-  <project name="platform/external/jpeg" path="external/jpeg" revision="7e70be1060ed0c16f48d1fd6a4aa8dcef2e41f34" upstream="master"/>
-  <project name="platform/external/jsilver" path="external/jsilver" revision="a618b151d54625078424bc5940f6bfd63344d11b" upstream="master"/>
-  <project name="platform/external/jsr305" path="external/jsr305" revision="5c7719ffff2b6b6acfde07b0e41c08224f443a7b" upstream="master"/>
-  <project name="platform/external/junit" path="external/junit" revision="c62242988737e0204e6b01312faeda3b9a2b64cd" upstream="master"/>
-  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="7f72817730203e59c142106e9f3a865a9232e00f" upstream="master"/>
-  <project name="platform/external/libffi" path="external/libffi" revision="bcb9a592a47ec641d7cec89e10fcf556132713aa" upstream="master"/>
-  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4" upstream="master"/>
-  <project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb" upstream="master"/>
-  <project name="platform/external/libmtp" path="external/libmtp" revision="294ecd05e897bf60912818a9d1805a4f651dc0bd" upstream="master"/>
-  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="e4d3c945777c912ba71e79ac99cb11190cf8f90a" upstream="master"/>
-  <project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658" upstream="master"/>
-  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a" upstream="master"/>
-  <project name="platform/external/libphonenumber" path="external/libphonenumber" revision="1fd8aeec10cd946dc827de26febf86f09e798410" upstream="master"/>
-  <project name="platform/external/libpng" path="external/libpng" revision="4c5554b04e73f89d4a9bab8cbcec1943d8c274be" upstream="master"/>
-  <project name="platform/external/libselinux" path="external/libselinux" revision="20f62f358ff65dae9aac74d6d1ccf2a648a9e20d" upstream="master"/>
-  <project name="platform/external/libsepol" path="external/libsepol" revision="4ebc669d5dc59771284b2d61eb4cce53e6a7069e" upstream="master"/>
-  <project name="platform/external/libusb" path="external/libusb" revision="2801917fe150393d4f4a354165fe89550ae22613" upstream="master"/>
-  <project name="platform/external/libusb-compat" path="external/libusb-compat" revision="94867ba54eb7faa8efca81cf2214d00bb9143d27" upstream="master"/>
-  <project name="platform/external/libvpx" path="external/libvpx" revision="b9c4e676b7be3cf3a9e45e06d71bf0ca92344a5b" upstream="master"/>
-  <project name="platform/external/libxml2" path="external/libxml2" revision="64a784a6fdd98fe0f65b881f9ace00f9a55d2053" upstream="master"/>
-  <project name="platform/external/libxslt" path="external/libxslt" revision="98f5140c33273d3bd67ca03566f8417406001016" upstream="master"/>
-  <project name="platform/external/libyuv" path="external/libyuv" revision="f102f0f69a0f47c3bbf8298f8acd23a6a8ef5fb3" upstream="master"/>
-  <project name="platform/external/linux-tools-perf" path="external/linux-tools-perf" revision="3043b1884e42ad9cfc7791b09d3cffc5f1ac13aa" upstream="master"/>
-  <project name="platform/external/littlemock" path="external/littlemock" revision="39909902f8225d886e40f929aaa25a2ef2aa58ec" upstream="master"/>
-  <project name="platform/external/llvm" path="external/llvm" revision="c0944da4c025a1402e1801ef9c9e6950dec43343" upstream="master"/>
-  <project name="platform/external/lohit-fonts" path="external/lohit-fonts" revision="948e68fa340804dd2036c7d02779ee84b386aceb" upstream="master"/>
-  <project name="platform/external/markdown" path="external/markdown" revision="6f2e3554ae38cc90518d32e02cb57d05988270a6" upstream="master"/>
-  <project name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="cf36684dd6ea25b2490317f2f76d2586b4c3e834" upstream="master"/>
-  <project name="platform/external/mesa3d" path="external/mesa3d" revision="45d57d9d39224c317e4cb130e803f452bbb00ca8" upstream="master"/>
-  <project name="platform/external/mksh" path="external/mksh" revision="93bd42c789325fdd5f8c9ba8f000abd65281f241" upstream="master"/>
-  <project name="platform/external/mockwebserver" path="external/mockwebserver" revision="83aa2d278c5a3f9b93cd809f6fdffba9d1fa3868" upstream="master"/>
-  <project name="platform/external/mtpd" path="external/mtpd" revision="c7a6056e3ac5111238ed1061d0c2a18f3febcd53" upstream="master"/>
-  <project name="platform/external/naver-fonts" path="external/naver-fonts" revision="22b92e01287be8705e2d7637c6d70538b051d91c" upstream="master"/>
-  <project name="platform/external/netcat" path="external/netcat" revision="8794905c49d077c2d3de1a5955fb25d4074f5709" upstream="master"/>
-  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362" upstream="master"/>
-  <project name="platform/external/neven" path="external/neven" revision="7f22db82120e7ac17165ab7614e417baa2742623" upstream="master"/>
-  <project name="platform/external/nist-sip" path="external/nist-sip" revision="b23dbfce7ea84c39cea75b612868a5832cb9af2b" upstream="master"/>
-  <project name="platform/external/oauth" path="external/oauth" revision="bc170f58de82000ed6460f111686a850a1890c07" upstream="master"/>
-  <project name="platform/external/okhttp" path="external/okhttp" revision="975568b5b9bdfdb3fe76359d13eba0f0babca7be" upstream="master"/>
-  <project name="platform/external/opencv" path="external/opencv" revision="1691b57dbad9cfc15b9a8b72f8b376733b934ffe" upstream="master"/>
-  <project name="platform/external/openfst" path="external/openfst" revision="f4c12fce1ee58e670f9c3fce46c40296ba9ee8a2" upstream="master"/>
-  <project name="platform/external/openssh" path="external/openssh" revision="e6f4e8e2fecd6edf704118f679750e412d227c3f" upstream="master"/>
-  <project name="platform/external/openssl" path="external/openssl" revision="5cbf3d1549d15a4416070b5c457288860dcf8651" upstream="master"/>
-  <project name="platform/external/oprofile" path="external/oprofile" revision="e36e25b6032bb8d194792e77d78f212997b40713" upstream="master"/>
-  <project name="platform/external/ping" path="external/ping" revision="8fc3c91cf9e7f87bc20b9e6d3ea2982d87b70d9a" upstream="master"/>
-  <project name="platform/external/ping6" path="external/ping6" revision="f340a2067a607fbaaccbcead3c767d1922a006dc" upstream="master"/>
-  <project name="platform/external/ppp" path="external/ppp" revision="e644c9d23cce70bf4e7db4a63325e5dc8ba87363" upstream="master"/>
-  <project name="platform/external/proguard" path="external/proguard" revision="9f606f95f03a75961498803e24bee6799a7c0885" upstream="master"/>
-  <project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431" upstream="master"/>
-  <project name="platform/external/qemu" path="external/qemu" revision="3b5568d57bd9b76c1ed7a0da3561381d3f42fbfa" upstream="master"/>
-  <project name="platform/external/qemu-pc-bios" path="external/qemu-pc-bios" revision="20349dae98d7de09a7e390d4a706c64f1db6edc2" upstream="master"/>
-  <project name="platform/external/quake" path="external/quake" revision="7a5374d597eac72560bb5a3f8209438896cfe8a7" upstream="master"/>
-  <project name="platform/external/regex-re2" path="external/regex-re2" revision="2ee91b4af4353b9e6a9d591c32fedfc58fd4ef35" upstream="master"/>
-  <project name="platform/external/replicaisland" path="external/replicaisland" revision="800662a3696ccd22a7d9d33cb2a5ee198df2c6cd" upstream="master"/>
-  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb" upstream="master"/>
-  <project name="platform/external/sepolicy" path="external/sepolicy" revision="f6647eb9f40a6a3d6dc3c1374d583e176a735498" upstream="master"/>
-  <project name="platform/external/skia" path="external/skia" revision="867c7f4475b85bbe90b25f99516bd9b36814be01" upstream="master"/>
-  <project name="platform/external/smali" path="external/smali" revision="28333561005524c15818b98c7f8f07409451ff30" upstream="master"/>
-  <project name="platform/external/sonivox" path="external/sonivox" revision="274d0571979c10a8c0bfe2641ada32a310248f13" upstream="master"/>
-  <project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32" upstream="master"/>
-  <project name="platform/external/sqlite" path="external/sqlite" revision="ed4638e217b868ae8509290a254a0d63e63f9302" upstream="master"/>
-  <project name="platform/external/srec" path="external/srec" revision="dc315cedb10875c8e7ccf8d9af45131993003244" upstream="master"/>
-  <project name="platform/external/srtp" path="external/srtp" revision="1b6ced2e633aae7d3ceb12ab17c3658e06632213" upstream="master"/>
-  <project name="platform/external/stlport" path="external/stlport" revision="9a078247c8ed289accbc5cf0938d3c767fbd0cf5" upstream="master"/>
-  <project name="platform/external/strace" path="external/strace" revision="7d2d23fd9b87c3a1fc61a51e6cb62923d952fb79" upstream="master"/>
-  <project name="platform/external/stressapptest" path="external/stressapptest" revision="b0303471fba852a1f1172e749a1ac8ced1499f08" upstream="master"/>
-  <project name="platform/external/svox" path="external/svox" revision="79622ebe5dd09754be0a5643413d11ecca300336" upstream="master"/>
-  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817" upstream="master"/>
-  <project name="platform/external/tcpdump" path="external/tcpdump" revision="532b8f38c144da9a298260a5d8978ab9e8e3856c" upstream="master"/>
-  <project name="platform/external/tinyalsa" path="external/tinyalsa" revision="60d82d75f995538f04ff47e9b7499c86d54b72f4" upstream="master"/>
-  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e" upstream="master"/>
-  <project name="platform/external/tremolo" path="external/tremolo" revision="3eec17965b3e2974e120e864b351a916f59835ba" upstream="master"/>
-  <project name="platform/external/v8" path="external/v8" revision="c796025f7dc5f8df7c0f9c76bcaee96a7716912d" upstream="master"/>
-  <project name="platform/external/valgrind" path="external/valgrind" revision="b74155602a0d3b88f821f49be09c5db5724dabec" upstream="master"/>
-  <project name="platform/external/webkit" path="external/webkit" revision="0d92bb867f45922c362c3f1be49b12d7d24899bf" upstream="master"/>
-  <project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd" upstream="master"/>
-  <project name="platform/external/webrtc" path="external/webrtc" revision="cf20dbf9d2547baa8a0fb631f282109e7a58a6cc" upstream="master"/>
-  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="20e9350e5fd358cd58db82c9157e9b23562ac097" upstream="master"/>
-  <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="992b10f49def736e424b9d6e01130de28b09cd1f" upstream="master"/>
-  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5" upstream="master"/>
-  <project name="platform/external/yaffs2" path="external/yaffs2" revision="f122d1cb99f0f510625c11fb3f6d3e47adaf585c" upstream="master"/>
-  <project name="platform/external/zlib" path="external/zlib" revision="7b332dbcb6a69c1919decb488c28d9b1fc5ba141" upstream="master"/>
-  <project name="platform/external/zxing" path="external/zxing" revision="7620644768ffc235607b3a94671e49518c18686f" upstream="master"/>
-  <project name="platform/frameworks/av" path="frameworks/av" revision="1baa01a52f24566c134313fade8b19a582654638" upstream="master"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="7e007ff83738a83f43cb59ddc023a2b860367074" upstream="master"/>
-  <project name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" revision="2e00e3b8648dbc2fc865f14545bff532b75250ee" upstream="master"/>
-  <project name="platform/frameworks/compile/linkloader" path="frameworks/compile/linkloader" revision="7a2648fe50aa247381f00f23b31c3add2a74e741" upstream="master"/>
-  <project name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" revision="abe0db302735bbdf9cd84caee2a36e6c4538fc4d" upstream="master"/>
-  <project name="platform/frameworks/compile/slang" path="frameworks/compile/slang" revision="6b071c38cda21c679c18310a823c17dad32e8ea1" upstream="master"/>
-  <project name="platform/frameworks/ex" path="frameworks/ex" revision="53a304102f3c0509feaf22bb9c717e5216a45150" upstream="master"/>
-  <project name="platform/frameworks/mff" path="frameworks/mff" revision="b9669b8540a1e5c953374d53b115514335e23c27" upstream="master"/>
-  <project name="platform/frameworks/ml" path="frameworks/ml" revision="b019e89cbea221598c482b05ab68b7660b41aa23" upstream="master"/>
-  <project name="platform/frameworks/native" path="frameworks/native" revision="7abbbc680d03dd8e50a709f89b78ace6b81154b0" upstream="master"/>
-  <project name="platform/frameworks/opt/calendar" path="frameworks/opt/calendar" revision="50e69cf7b39993358644988484667c0f3ce0af9e" upstream="master"/>
-  <project name="platform/frameworks/opt/carddav" path="frameworks/opt/carddav" revision="f08aa2df132dd8dc32a0013d3750137d9dd9280a" upstream="master"/>
-  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="0805d75d3c4319f54fb3c854be2f7baab561cf1b" upstream="master"/>
-  <project name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon" revision="df9dd39c2047992a43b64e13bb0fc348a1630f3b" upstream="master"/>
-  <project name="platform/frameworks/opt/mailcommon" path="frameworks/opt/mailcommon" revision="d82363c19cbfea1d6505f2c21467df84d021d511" upstream="master"/>
-  <project name="platform/frameworks/opt/mms" path="frameworks/opt/mms" revision="008eb65f170aecb25d674cb47a8fcd3edd8b6b8e" upstream="master"/>
-  <project name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="f0b6e3ed7881f0a92281684e70c6249d0898338c" upstream="master"/>
-  <project name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" revision="449d710428682b3f44ba20ce290564cd9352ca0a" upstream="master"/>
-  <project name="platform/frameworks/rs" path="frameworks/rs" revision="5359ef6790bad7a36b3aad97f5c859d4635bd926" upstream="master"/>
-  <project name="platform/frameworks/support" path="frameworks/support" revision="53fd96027e9fb41019a63ca8daa5bcd664d6f244" upstream="master"/>
-  <project name="platform/frameworks/testing" path="frameworks/testing" revision="65d7dfd4f9343b1ca1e0e095d4703ca0dc4cd0b8" upstream="master"/>
-  <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="91145ef159d3e165a461cbd76341ff8ed3d72bae" upstream="master"/>
-  <project name="platform/gdk" path="gdk" revision="90dfd3839f9f755ee288e5d64fb2221d1512ea8d" upstream="master"/>
-  <project name="platform/hardware/akm" path="hardware/akm" revision="6f701daf0b67ef38f1ba1700984ec78134669cd0" upstream="master"/>
-  <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="43362466e68ebaed8b7ca5eaf5c9cede8b7a0f57" upstream="master"/>
-  <project name="platform/hardware/invensense" path="hardware/invensense" revision="8792ef0f74a024dec788de02f60280dd66f871f3" upstream="master"/>
-  <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="42a70b67abf0fce9c0f898c92a6e3c36e92773e9" upstream="master"/>
-  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="e0232039e0a59f7ef4fc67dad178387b2d5fffba" upstream="master"/>
-  <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="f587fd7829fcd2ef42241ef140de203b520a6405" upstream="master"/>
-  <project name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="80698b8a3d09cec7485499d634f4f96f614ec26c" upstream="master"/>
-  <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="bac93072368cffe559a5621f32e6549e77ffc9cf" upstream="master"/>
-  <project name="platform/hardware/ril" path="hardware/ril" revision="a1d41fea6ee68c5edc077ddf4bb6bac8b32e9e41" upstream="master"/>
-  <project name="platform/hardware/ti/omap3" path="hardware/ti/omap3" revision="efbb6b2de5fa16ef72bbf02526e3c0a7a6d63a4f" upstream="master"/>
-  <project name="platform/hardware/ti/omap4xxx" path="hardware/ti/omap4xxx" revision="53835e97845edf78d513010ae4faa8fc467f0a6c" upstream="master"/>
-  <project name="platform/hardware/ti/wlan" path="hardware/ti/wlan" revision="cece92a8acff0a81868e6cac326bcf61e54c5aec" upstream="master"/>
-  <project name="platform/hardware/ti/wpan" path="hardware/ti/wpan" revision="d8ca062b061b04561c60873905ecbcf0fdfda1a9" upstream="master"/>
-  <project name="platform/libcore" path="libcore" revision="372334da225b4265897d193df1ea692e601fa213" upstream="master"/>
-  <project name="platform/libnativehelper" path="libnativehelper" revision="73d3c2e3ed100f1d0ccc08a9675844bf8a0848fa" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="9dc99a7d5e12f2becfef2499a2cff7a358d2cb01" upstream="master"/>
-  <project name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" revision="545a49fe37062e3df87556d7f9bbdda7ad9434e0" upstream="master"/>
-  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="d329befdd38a5c441e1a2b7e4595b7de86ac100b" upstream="master"/>
-  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="571866cd42918d9227db8424667c585b8f9fdf94" upstream="master"/>
-  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="7e4712c96ff60391892425ee50b02170aac3c3d0" upstream="master"/>
-  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="05b1f9b5fa9be52ac0282ff3ce0c1982dc2a9eaa" upstream="master"/>
-  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="eb9455b065bb112e27ff25e638bb0fb642b58b13" upstream="master"/>
-  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="95e4147f2ff48cec7c2a3c94e5f931ade551ec76" upstream="master"/>
-  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="83df03c8f5d61d37e2fda501c67937f970b7af0c" upstream="master"/>
-  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="3455f8ab45bf33f1cd0152040cdc283d83d01c74" upstream="master"/>
-  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="abc8c319c1fe82b79a43c2ae76a42db467e1cf92" upstream="master"/>
-  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="31f53df3bf29eb1ce8869c17f8ed2be64ddc1f82" upstream="master"/>
-  <project name="platform/packages/apps/Exchange" path="packages/apps/Exchange" revision="049cbd5834705cfbb1c4e3fd433c1b9cb140dd9c" upstream="master"/>
-  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="d734c20e322e335a7a8405cac2bb9ae5b3958705" upstream="master"/>
-  <project name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" revision="7a447b30f6f58445bfa040958a9fa5f392296aaa" upstream="master"/>
-  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="4222180dd0d4f3e1f094bf72a78d6d88a876bac8" upstream="master"/>
-  <project name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" revision="b9bae2cd234ed07d72cf73616d15774860eac023" upstream="master"/>
-  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="4124016ae5c8174aa53433894b896604ffa52c67" upstream="master"/>
-  <project name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" revision="b818e8e15a8a0d1ad1f04f01797974de138b59d1" upstream="master"/>
-  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="b2c79a9e772846b3c68cbf9051aa0dedb3ad702d" upstream="master"/>
-  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="2996191189a9104852eedf1c97b68b0259579586" upstream="master"/>
-  <project name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" revision="0b8ca377f11f5a4f25c505f29c352024f9fcc0ae" upstream="master"/>
-  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="d09c8d1d583e7ef3038e0dcfd657fcc56f963e4b" upstream="master"/>
-  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="47fe118e0178e9d72c98073ff588ee5cf353258e" upstream="master"/>
-  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="2aa64e78158e270702acbbb0c1875070d3e577e3" upstream="master"/>
-  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="1523bc37f4a30f890d2c17afc604ff364132ebab" upstream="master"/>
-  <project name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="86bf6d8ac38de74b1bead64ac26fe5130dfffbf5" upstream="master"/>
-  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="5fa3b0bc6bf9bd0b3ab7c18a302a122afdb20e0d" upstream="master"/>
-  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="78f5c4d5372e38b5a5d1e2f3e3b732951a76f007" upstream="master"/>
-  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7" upstream="master"/>
-  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="de28200b196b869971368f90436f637273212065" upstream="master"/>
-  <project name="platform/packages/apps/SpareParts" path="packages/apps/SpareParts" revision="10f05a57805c5409f990959dcad25c67a82ec16d" upstream="master"/>
-  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="536aa74ff3a77186bef29dc9333a34688fa59d13" upstream="master"/>
-  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="8e36a0a6f618dd01122efc838fc90b04799b3c97" upstream="master"/>
-  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="9e84cb935447dd11d16a3f9ff51cf65181d1e6c0" upstream="master"/>
-  <project name="platform/packages/apps/VideoEditor" path="packages/apps/VideoEditor" revision="807f297a7ef4572c89bb89dc07a26ae8e23b2466" upstream="master"/>
-  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="6799d450c4f0e129eb5c414a93dc553d7058e941" upstream="master"/>
-  <project name="platform/packages/experimental" path="packages/experimental" revision="b727ba0ef342429de7605586b9d389f992621978" upstream="master"/>
-  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="f6df37ce2dce9ada1af097e0c2fbdd84c0334c61" upstream="master"/>
-  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="59aefa242169b7a51c2381daee58ff22fd1834ce" upstream="master"/>
-  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="a08d08cdea4319fb74b55289e1b4e1b1a5249bc2" upstream="master"/>
-  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="c073b166ef52ccb8216afa2e3e2716c3647e03a9" upstream="master"/>
-  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="f98ed2e5c5e08cac159ce4cf22ab86a718f0bb0b" upstream="master"/>
-  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="0e014723e6d5d2acc3d59b78cee9a6d1fbfef1e9" upstream="master"/>
-  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="d7dd6019baf12961dce722d33003e238cdd72f6a" upstream="master"/>
-  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="1c546fe0af9b77fae9e07ad139360efb27a46237" upstream="master"/>
-  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="7021e10495b533cf75f032542afa8a2fd703f918" upstream="master"/>
-  <project name="platform/packages/providers/PartnerBookmarksProvider" path="packages/providers/PartnerBookmarksProvider" revision="96d0a80af45923767baf449fc8c735c2f71d64ae" upstream="master"/>
-  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="8c15b8cf7fb6527eff8cdb8a0e162f28e863137a" upstream="master"/>
-  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="ccfedce270d66beb36c685cb496245c699917832" upstream="master"/>
-  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="e436e18739369bfc1c4a1e9cdd42c257aabe5031" upstream="master"/>
-  <project name="platform/packages/wallpapers/Galaxy4" path="packages/wallpapers/Galaxy4" revision="9cc201742a70ab0879965d23d2c2b33ee6c18e70" upstream="master"/>
-  <project name="platform/packages/wallpapers/HoloSpiral" path="packages/wallpapers/HoloSpiral" revision="b9f9487b73b1675eddd104489c10e4589d447b07" upstream="master"/>
-  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="b6484d3e816812bf1fac83b7606a9a590a846226" upstream="master"/>
-  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="48b5d9c23834eb74cc883b046d9cb7918687c868" upstream="master"/>
-  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="3042e3ab2ea21be3ffe740a377c2030431ace04e" upstream="master"/>
-  <project name="platform/packages/wallpapers/NoiseField" path="packages/wallpapers/NoiseField" revision="4cd1e13e3f6af7ab2c2ff3d5953d7e3677e2f0b1" upstream="master"/>
-  <project name="platform/packages/wallpapers/PhaseBeam" path="packages/wallpapers/PhaseBeam" revision="646ff43b4e358492c98f17d1e969f73afbd283cb" upstream="master"/>
-  <project name="platform/pdk" path="pdk" revision="076301f0488b2b5e0a89ef60076051a71ab5e9eb" upstream="master"/>
-  <project name="platform/prebuilts/eclipse" path="prebuilts/eclipse" revision="c271db8ee0361092b49841f66673296107b9c5d9" upstream="master"/>
-  <project groups="notdefault,eclipse" name="platform/prebuilts/eclipse-build-deps" path="prebuilts/eclipse-build-deps" revision="0d1686bbc73a0dcec0d392865922d19726b929dd" upstream="master"/>
-  <project groups="notdefault,eclipse" name="platform/prebuilts/eclipse-build-deps-sources" path="prebuilts/eclipse-build-deps-sources" revision="8b7d8f6033ffe2d22905d10cf6d57d5bdcbe519b" upstream="master"/>
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" revision="21b2cba584638ed5ffad8e3fd3e6808bfa299cf0" upstream="master"/>
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" revision="82a38ffaad280ad07506fd6ee762c93c79f7f05a" upstream="master"/>
-  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" revision="837cdd9b3ac7231daaf961056c7505843130f667" upstream="master"/>
-  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" revision="042d6130038c95be86fcea5dddda2db07bd5aa27" upstream="master"/>
-  <project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" revision="d73a051b1fd1d98f5c2463354fb67898f0090bdb" upstream="master"/>
-  <project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" revision="c63c3b97bd3b9d37680f58b63c61027ec414ad79" upstream="master"/>
-  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" revision="10191e2f442c5409cb70783508658d474612a97e" upstream="master"/>
-  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="9e754ea754eac37d1cd20182cc5d37df85239b0d" upstream="master"/>
-  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="4b88bc4aafd69d02e14e2aa99046db67666f7f52" upstream="master"/>
-  <project groups="linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" revision="90fc0bd53f2d07ef2383bfad53671f76801c740e" upstream="master"/>
-  <project groups="linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" revision="b9ebba077c2f62e930b16240d7f3ad61f1ad1dfc" upstream="master"/>
-  <project name="platform/prebuilts/misc" path="prebuilts/misc" revision="2cd889ef5c26799bc16ace6c1540be1bc4f5f896" upstream="master"/>
-  <project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="ab7b178935f5436626588b877a6aedb4cd02c35d" upstream="master"/>
-  <project name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="f1b132a1caaec8a89785f83f0201d07e72cce4cc" upstream="master"/>
-  <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="a69334b11819054948d1c05fc4ffc0c3a8565091" upstream="master"/>
-  <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="bbf7c256c4f5261c20599ec2f0d4f9316cb226bd" upstream="master"/>
-  <project name="platform/sdk" path="sdk" revision="aae8bf4a7c04842cfb3aff9047e4784381b2600d" upstream="master"/>
-  <project name="platform/system/bluetooth" path="system/bluetooth" revision="658c98723518f124ea534d022ef7ed8fc7c68f33" upstream="master"/>
-  <project name="platform/system/core" path="system/core" revision="a6fb0e05aa95995445c6f2b65f07db26bdbfd46c" upstream="master"/>
-  <project name="platform/system/extras" path="system/extras" revision="7176b213480e87bc303073ccc553fdc824198355" upstream="master"/>
-  <project name="platform/system/media" path="system/media" revision="5b1a974d08aa0bfa25d890026b38073375bdbf55" upstream="master"/>
-  <project name="platform/system/netd" path="system/netd" revision="78b00d81ebb7e2720fe17c116bcfd086bdd1f4e7" upstream="master"/>
-  <project name="platform/system/security" path="system/security" revision="66702f7263eb7e30a4596135bb18443997bc24cf" upstream="master"/>
-  <project name="platform/system/vold" path="system/vold" revision="edf4e17940c6d3887e9009b23ffca5be8116fbe9" upstream="master"/>
-  <project groups="toolsbuild" name="platform/tools/build" path="tools/build" revision="f6d881b932302bbdd4347a71bf58deda816c99b9" upstream="master"/>
-  <project name="platform/tools/motodev" path="tools/motodev" revision="69989786cefbde82527960a1e100ec9afba46a98" upstream="master"/>
-</manifest>
diff --git a/default.xml b/default.xml
index b1bb368..3bfeb48 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch=".."
            review="https://android-review.googlesource.com/" />
-  <default revision="master"
+  <default revision="jb-mr2-dev"
            remote="aosp"
            sync-j="4" />
 
@@ -16,17 +16,26 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
-  <project path="cts" name="platform/cts" />
+  <project path="cts" name="platform/cts" groups="cts" />
   <project path="dalvik" name="platform/dalvik" />
+  <project path="developers/build" name="platform/developers/build" />
+  <project path="developers/demos" name="platform/developers/demos" />
+  <project path="developers/docs" name="platform/developers/docs" />
+  <project path="developers/samples/android" name="platform/developers/samples/android" />
   <project path="development" name="platform/development" />
+  <project path="device/asus/deb" name="device/asus/deb" groups="device,flo" />
+  <project path="device/asus/flo" name="device/asus/flo" groups="device,flo" />
+  <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="device,flo" />
   <project path="device/asus/grouper" name="device/asus/grouper" groups="device,grouper" />
   <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device,grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
-  <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="pdk" />
   <project path="device/generic/common" name="device/generic/common" groups="pdk" />
   <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk" />
   <project path="device/generic/mips" name="device/generic/mips" groups="pdk" />
+  <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" />
+  <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="pdk" />
+  <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" />
   <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
@@ -51,20 +60,18 @@
   <project path="external/apache-qp" name="platform/external/apache-qp" />
   <project path="external/apache-xml" name="platform/external/apache-xml" />
   <project path="external/arduino" name="platform/external/arduino" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
+  <project path="external/bison" name="platform/external/bison" groups="pdk" />
   <project path="external/blktrace" name="platform/external/blktrace" />
   <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="pdk" />
   <project path="external/bouncycastle" name="platform/external/bouncycastle" />
   <project path="external/bsdiff" name="platform/external/bsdiff" groups="pdk" />
   <project path="external/bzip2" name="platform/external/bzip2" groups="pdk" />
-  <project path="external/checkpolicy" name="platform/external/checkpolicy" />
+  <project path="external/ceres-solver" name="platform/external/ceres-solver" />
+  <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="pdk" />
   <project path="external/chromium" name="platform/external/chromium" />
   <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="pdk" />
-  <project path="external/cibu-fonts" name="platform/external/cibu-fonts" />
   <project path="external/clang" name="platform/external/clang" groups="pdk" />
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" />
-  <project path="external/dbus" name="platform/external/dbus" groups="pdk" />
   <project path="external/dexmaker" name="platform/external/dexmaker" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" />
@@ -101,7 +108,6 @@
   <project path="external/iproute2" name="platform/external/iproute2" groups="pdk" />
   <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
   <project path="external/iptables" name="platform/external/iptables" />
-  <project path="external/iputils" name="platform/external/iputils" />
   <project path="external/jack" name="platform/external/jack" />
   <project path="external/javasqlite" name="platform/external/javasqlite" />
   <project path="external/javassist" name="platform/external/javassist" />
@@ -116,7 +122,7 @@
   <project path="external/kernel-headers" name="platform/external/kernel-headers" />
   <project path="external/libcap-ng" name="platform/external/libcap-ng" />
   <project path="external/libffi" name="platform/external/libffi" />
-  <project path="external/libgsm" name="platform/external/libgsm" />
+  <project path="external/libgsm" name="platform/external/libgsm" groups="pdk" />
   <project path="external/liblzf" name="platform/external/liblzf" groups="pdk" />
   <project path="external/libmtp" name="platform/external/libmtp" />
   <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="pdk" />
@@ -127,23 +133,22 @@
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" groups="pdk" />
   <project path="external/libppp" name="platform/external/libppp" />
-  <project path="external/libselinux" name="platform/external/libselinux" />
-  <project path="external/libsepol" name="platform/external/libsepol" />
+  <project path="external/libselinux" name="platform/external/libselinux" groups="pdk" />
+  <project path="external/libsepol" name="platform/external/libsepol" groups="pdk" />
   <project path="external/libusb" name="platform/external/libusb" />
-  <project path="external/libusb_aah" name="platform/external/libusb_aah" />
+  <project path="external/libusb_aah" name="platform/external/libusb_aah" groups="libusb_aah" />
   <project path="external/libusb-compat" name="platform/external/libusb-compat" />
   <project path="external/libvorbis" name="platform/external/libvorbis" />
   <project path="external/libvpx" name="platform/external/libvpx" groups="pdk" />
   <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/libyuv" name="platform/external/libyuv" groups="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" groups="pdk" />
-  <project path="external/lohit-fonts" name="platform/external/lohit-fonts" />
+  <project path="external/marisa-trie" name="platform/external/marisa-trie" />
   <project path="external/markdown" name="platform/external/markdown" />
   <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk" />
   <project path="external/mksh" name="platform/external/mksh" groups="pdk" />
   <project path="external/mockito" name="platform/external/mockito" />
   <project path="external/mockwebserver" name="platform/external/mockwebserver" />
@@ -155,9 +160,11 @@
   <project path="external/neven" name="platform/external/neven" />
   <project path="external/nist-pkits" name="platform/external/nist-pkits" />
   <project path="external/nist-sip" name="platform/external/nist-sip" />
+  <project path="external/noto-fonts" name="platform/external/noto-fonts" />
   <project path="external/oauth" name="platform/external/oauth" />
   <project path="external/objenesis" name="platform/external/objenesis" />
   <project path="external/okhttp" name="platform/external/okhttp" />
+  <project path="external/open-vcdiff" name="platform/external/open-vcdiff" />
   <project path="external/opencv" name="platform/external/opencv" />
   <project path="external/openfst" name="platform/external/openfst" />
   <project path="external/openssh" name="platform/external/openssh" />
@@ -173,10 +180,11 @@
   <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/robolectric" name="platform/external/robolectric" />
   <project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" />
-  <project path="external/scrypt" name="platform/external/scrypt" />
-  <project path="external/sepolicy" name="platform/external/sepolicy" />
+  <project path="external/sepolicy" name="platform/external/sepolicy" groups="pdk" />
   <project path="external/skia" name="platform/external/skia" />
+  <project path="external/smack" name="platform/external/smack" />
   <project path="external/smali" name="platform/external/smali" />
   <project path="external/sonivox" name="platform/external/sonivox" groups="pdk" />
   <project path="external/speex" name="platform/external/speex" groups="pdk" />
@@ -189,8 +197,9 @@
   <project path="external/svox" name="platform/external/svox" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
+  <project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" />
   <project path="external/tinyalsa" name="platform/external/tinyalsa" groups="pdk" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
+  <project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" />
   <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="pdk" />
   <project path="external/tremolo" name="platform/external/tremolo" groups="pdk" />
   <project path="external/v8" name="platform/external/v8" />
@@ -198,7 +207,6 @@
   <project path="external/webkit" name="platform/external/webkit" />
   <project path="external/webp" name="platform/external/webp" />
   <project path="external/webrtc" name="platform/external/webrtc" groups="pdk" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" groups="pdk" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" />
@@ -208,30 +216,33 @@
   <project path="frameworks/av" name="platform/frameworks/av" groups="pdk" />
   <project path="frameworks/base" name="platform/frameworks/base" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="pdk" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" groups="pdk" />
-  <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" groups="pdk" />
   <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="pdk" />
-  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
+  <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="pdk" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="frameworks/mff" name="platform/frameworks/mff" />
   <project path="frameworks/ml" name="platform/frameworks/ml" />
   <project path="frameworks/native" name="platform/frameworks/native" groups="pdk" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" />
+  <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" />
+  <project path="frameworks/opt/datetimepicker" name="platform/frameworks/opt/datetimepicker" />
   <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/net/voip" name="platform/frameworks/opt/net/voip" />
   <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" />
-  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" />
+  <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" />
+  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" groups="pdk" />
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" />
   <project path="frameworks/support" name="platform/frameworks/support" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="frameworks/volley" name="platform/frameworks/volley" />
+  <project path="frameworks/webview" name="platform/frameworks/webview" />
   <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" />
-  <project path="gdk" name="platform/gdk" />
   <project path="hardware/akm" name="platform/hardware/akm" />
+  <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" />
   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="broadcom_wlan" />
   <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" />
@@ -239,19 +250,16 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom" />
   <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom" />
-  <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" groups="qcom" />
   <project path="hardware/qcom/display" name="platform/hardware/qcom/display" groups="qcom" />
-  <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" groups="qcom" />
   <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="qcom" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" groups="qcom" />
-  <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom" />
+  <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960" />
   <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom" />
   <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="qcom" />
   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan" />
   <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
   <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="exynos5" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/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="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
@@ -267,13 +275,14 @@
   <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/ContactsCommon" name="platform/packages/apps/ContactsCommon" />
   <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
+  <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" />
   <project path="packages/apps/Email" name="platform/packages/apps/Email" />
   <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" />
   <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
   <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" />
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/InCallUI" name="platform/packages/apps/InCallUI" />
   <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" />
@@ -281,8 +290,10 @@
   <project path="packages/apps/Music" name="platform/packages/apps/Music" />
   <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />
   <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
+  <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" />
   <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
   <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
+  <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" />
   <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision" />
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
@@ -311,7 +322,6 @@
   <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" />
   <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" />
   <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" />
-  <project path="packages/services/Telephony" name="platform/packages/services/Telephony" />
   <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" />
   <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" />
   <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" />
@@ -323,16 +333,8 @@
   <project path="pdk" name="platform/pdk" groups="pdk" />
   <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="pdk,darwin" />
   <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="pdk,darwin" />
-  <project path="prebuilts/clang/darwin-x86/arm/3.3" name="platform/prebuilts/clang/darwin-x86/arm/3.3" groups="darwin,arm" />
-  <project path="prebuilts/clang/darwin-x86/host/3.3" name="platform/prebuilts/clang/darwin-x86/host/3.3" groups="darwin" />
-  <project path="prebuilts/clang/darwin-x86/mips/3.3" name="platform/prebuilts/clang/darwin-x86/mips/3.3" groups="darwin,mips" />
-  <project path="prebuilts/clang/darwin-x86/x86/3.3" name="platform/prebuilts/clang/darwin-x86/x86/3.3" groups="darwin,x86" />
   <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="pdk,linux" />
   <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="pdk,linux" />
-  <project path="prebuilts/clang/linux-x86/arm/3.3" name="platform/prebuilts/clang/linux-x86/arm/3.3" groups="linux,arm" />
-  <project path="prebuilts/clang/linux-x86/host/3.3" name="platform/prebuilts/clang/linux-x86/host/3.3" groups="linux" />
-  <project path="prebuilts/clang/linux-x86/mips/3.3" name="platform/prebuilts/clang/linux-x86/mips/3.3" groups="linux,mips" />
-  <project path="prebuilts/clang/linux-x86/x86/3.3" name="platform/prebuilts/clang/linux-x86/x86/3.3" groups="linux,x86" />
   <project path="prebuilts/devtools" name="platform/prebuilts/devtools" />
   <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="pdk" />
   <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
@@ -347,7 +349,6 @@
   <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" groups="pdk,darwin,mips" />
   <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="pdk,darwin,x86" />
   <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" groups="pdk,darwin,x86" />
-  <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.7" groups="pdk,darwin,x86" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="pdk,linux,arm" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="pdk,linux,arm" />
@@ -359,11 +360,8 @@
   <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" groups="pdk,linux,mips" />
   <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="pdk,linux,x86" />
   <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" groups="pdk,linux,x86" />
-  <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.7" groups="pdk,linux,x86" />
   <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="pdk" />
   <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="pdk" />
-  <project path="prebuilts/python/darwin-x86/2.7.5" name="platform/prebuilts/python/darwin-x86/2.7.5" groups="darwin" />
-  <project path="prebuilts/python/linux-x86/2.7.5" name="platform/prebuilts/python/linux-x86/2.7.5" groups="linux" />
   <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="pdk" />
   <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" />
   <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="pdk,tools" />
@@ -384,7 +382,6 @@
   <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="notdefault,tools" />
   <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" />
   <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" />
-  <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools" />
   <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
 
 </manifest>