manifest:sync to google p-tv-ref-dev [1/1]

PD#SWPL-36434

Problem:
mirror code from google

Solution:
update to google build 6970477 named 6970477
e089f9638

Verify:
anning

Change-Id: Ic94fec6e54a69cc2fd1b296d850d78410d46f4f6

2 files changed, 124 insertions, 140 deletions

diff --git a/default.xml b/default.xml
index 480ff5a..c1bb003 100644
--- a/default.xml
+++ b/default.xml
@@ -2,10 +2,15 @@
 <manifest>
   <remote fetch="git://pdk-o.myamlogic.com/pdk-o" name="ohd" review="https://partner-android.googlesource.com"/>
 
-  <default dest-branch="p-tv-dev" remote="ohd" revision="p-tv-dev" sync-j="4"/>
+  <default dest-branch="p-tv-ref-dev" remote="ohd" revision="p-tv-ref-dev" sync-j="4"/>
 
-  <manifest-server url="http://android-smartsync.corp.google.com/manifestserver"/>
-  <project groups="device,amlogic,amlogic-core" name="device/amlogic/common" revision="64714510cf2de3c340b9e9cdc93012ab54beebc9"/>
+  <project dest-branch="p-tv-dev" groups="device,ampere,amlogic" name="device/amlogic/ampere" revision="da52e104799d82d25e7a750456c634defa3e9281"/>
+  <project clone-depth="2" dest-branch="p-tv-dev" groups="device,ampere,amlogic" name="device/amlogic/ampere-kernel" revision="d9123a24571dbabd3dc4640e9f36aa846dcb0876"/>
+  <project dest-branch="p-tv-dev" groups="device,amlogic,amlogic-core" name="device/amlogic/common" revision="b7b1032e4c298537bfea8a64fa55195971b262c9"/>
+  <project dest-branch="p-tv-dev" groups="device,darwin,amlogic" name="device/amlogic/darwin" revision="360a99ad70a6d3771c843c617e3186b45699266a"/>
+  <project clone-depth="2" dest-branch="p-tv-dev" groups="device,darwin,amlogic" name="device/amlogic/darwin-kernel" revision="dc7f8f34882428c8bb826c49cedf451d45515cfc"/>
+  <project dest-branch="p-tv-dev" groups="device,franklin,amlogic" name="device/amlogic/franklin" revision="5b0a04c14cf6e55b426a9b5d25a7f3b1969c8cc7"/>
+  <project clone-depth="2" dest-branch="p-tv-dev" groups="device,franklin,amlogic" name="device/amlogic/franklin-kernel" revision="adebf49ccfadc7251f2740304bc9fa03704d32aa"/>
   <project groups="pdk-cw-fs,pdk" name="device/common" revision="b2a57266e67f331818958a99d43a3ab7061730be"/>
   <project groups="pdk" name="device/generic/arm64" revision="325b7ec3eab920869050bbfedbd3461f9aed5eb5"/>
   <project groups="pdk" name="device/generic/armv7-a-neon" revision="9e96e041bf3c9d5b57b11f921c6339e076478a7a"/>
@@ -22,7 +27,6 @@
   <project groups="pdk" name="device/generic/mini-emulator-x86_64" revision="b62205d75073783e171fbcd5f675e25e57833479"/>
   <project groups="pdk" name="device/generic/mips" revision="bf27f9bcb56e483310507f78f0a4b93d3f5499c5"/>
   <project groups="pdk" name="device/generic/mips64" revision="34300f7753b7a9fa2f7ba16bdc1f1fb8625dd4e4"/>
-  <project groups="pdk" name="device/generic/opengl-transport" revision="062cea8d03c150cc9f202dc9d2c3eacd98181342"/>
   <project groups="pdk" name="device/generic/qemu" revision="872a4b3f2cba32121e3ba5c928ccc835f0d13578"/>
   <project groups="device,pdk" name="device/generic/uml" revision="5ff90bb48866267b91321f1e3b5b205981fbf889"/>
   <project groups="pdk" name="device/generic/x86" revision="ef98c6934284e304ff04d6d264cf02fa2c1e2ef2"/>
@@ -33,27 +37,23 @@
   <project groups="device,marlin,pdk" name="device/google/contexthub" revision="982e18b16fd9e1a859db24a66a6c440c340e98fd"/>
   <project groups="device,pdk" name="device/google/cuttlefish" revision="9166e545324c8cbe68529e75b8b2cbb2504b181b"/>
   <project groups="device,pdk" name="device/google/cuttlefish_common" revision="e97e68d3504352a86bd7b36d53fd1ba81445c9d6"/>
-  <project groups="device,pdk" name="device/google/cuttlefish_kernel" revision="02e973171f3339309da6a90fe0308e4cccbcd9ba"/>
+  <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_kernel" revision="02e973171f3339309da6a90fe0308e4cccbcd9ba"/>
   <project groups="device,marlin,pdk" name="device/google/marlin" revision="2466ae48a9f1b91414a89fae19289e808d431ef8"/>
-  <project groups="device,marlin,pdk" name="device/google/marlin-kernel" revision="0645f4f7cb944791b9caef592047e00e2da1c4e5"/>
+  <project clone-depth="1" groups="device,marlin,pdk" name="device/google/marlin-kernel" revision="0645f4f7cb944791b9caef592047e00e2da1c4e5"/>
   <project groups="device,muskie,pdk" name="device/google/muskie" revision="a9eee8b117a273bfa1d143bd3c540a10a7b246c0"/>
-  <project groups="device,sabrina,pdk" name="device/google/sabrina" revision="235a71d6154b7ff7e62ecc2b957438672fcacfa3"/>
-  <project groups="device,sabrina,pdk" name="device/google/sabrina-kernel" revision="fa7e5c16baa15278d30b99f433782a0dc4c76558"/>
   <project groups="device,taimen,pdk" name="device/google/taimen" revision="a69be52c805cf29639437460747b4c585b646527"/>
-  <project groups="pdk" name="device/google/vrservices" revision="bdc90104b414fd8caacf07eb960f1519de57f500"/>
-  <project groups="device,wahoo,pdk" name="device/google/wahoo" revision="4b86ea36c38c2c496469a4bd77eedc8fc5ecfcfc"/>
-  <project groups="device,wahoo,pdk" name="device/google/wahoo-kernel" revision="016ba5a7612172a1f7cec2a96518cd08e2044747"/>
-  <project groups="device,harman,atom" name="device/harman/atom" revision="18c1d3970fe406bff785c429045b2fd40f1665c9"/>
-  <project clone-depth="2" groups="device,harman,atom" name="device/harman/atom-kernel" revision="bea9da6a07753cdfeedee57056d09f4b65f11a37"/>
+  <project clone-depth="1" groups="pdk" name="device/google/vrservices" revision="bdc90104b414fd8caacf07eb960f1519de57f500"/>
+  <project groups="device,wahoo,pdk" name="device/google/wahoo" revision="ec4357b3a5125b26af7e3e4512fdc97a787cd49b"/>
+  <project clone-depth="1" groups="device,wahoo,pdk" name="device/google/wahoo-kernel" revision="016ba5a7612172a1f7cec2a96518cd08e2044747"/>
   <project groups="device,hikey,pdk" name="device/linaro/hikey" revision="02957e851932de10cc63b84b4610f97759a1a615"/>
   <project clone-depth="1" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" revision="16a2c660ae827f7f3352f6cb2fe29caafc918004"/>
-  <project groups="pdk" name="device/sample" revision="c4aee63cdeec1e4032054b37bd42d0bc93d8fd6a"/>
-  <project groups="vts,pdk" name="kernel/configs" revision="e5ec90d270b7aad2fc74e82227aea153f5f15c2f"/>
-  <project groups="vts,pdk" name="kernel/tests" revision="840529a015f330f98b15a61114d7420d98a259f4"/>
+  <project groups="pdk" name="device/sample" revision="a9813f49a5dd898e512e344540f0a2338533fb83"/>
+  <project groups="vts,pdk" name="kernel/configs" revision="a3bdc7046188bdf545ea8d05c8dd698866aeba46"/>
+  <project groups="vts,pdk" name="kernel/tests" revision="f2ac14d5f5b10a9a1abffc46540d20990a960d6e"/>
   <project groups="pdk" name="platform/art" path="art" revision="8faac3d3a6f8e34765fc66bd5155895fa5b81b23"/>
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="dc88abd5885eb2c6eacb20961fce8b178f6f1909"/>
-  <project groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" revision="fc1dc2c8c50737a6c32129ff974fc48f7db4e2f8"/>
-  <project groups="pdk" name="platform/build" path="build/make" revision="76a07d40336abe442ac38f864ae404a1bd2200b6">
+  <project groups="pdk" name="platform/bionic" path="bionic" revision="8c4928caafe9fa293b87c814445faf71936477d4"/>
+  <project groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" revision="d98b3ae7cb9cf9608ca239f11009434309943069"/>
+  <project groups="pdk" name="platform/build" path="build/make" revision="3fd73fd4b1399b9277aa7022eeaaa7ed60cb178e">
     <copyfile dest="Makefile" src="core/root.mk"/>
     <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk"/>
     <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default"/>
@@ -69,12 +69,12 @@
     <linkfile dest="bootstrap.bash" src="bootstrap.bash"/>
   </project>
   <project groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" revision="607149210f5d41dcf04677c761fa8de9a66f7dd3"/>
-  <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" revision="084803423e39f84087fc1151f2b31eee5953d08e"/>
+  <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" revision="91027823642998607cdf5d1a8792b4c790431b36"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" revision="1a77f29b0d7c1ab00f19338295be9effb198ec7e"/>
   <project groups="developers,pdk-cw-fs,pdk-fs" name="platform/development" path="development" revision="a921314e3f428c72cdb28f48829a0cb520637d22"/>
   <project groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" revision="ca478d8a60d268965f9465723161f31a72f66a71"/>
   <project groups="pdk" name="platform/external/Microsoft-GSL" path="external/Microsoft-GSL" revision="2ef7b8a9e35e409b175e190298cde5434155f54a"/>
-  <project groups="pdk" name="platform/external/aac" path="external/aac" revision="41714b95fdd739da5632483f8f1a5e00b7788b15"/>
+  <project groups="pdk" name="platform/external/aac" path="external/aac" revision="6cc6667605bea7f52538d18df19300fc51abd124"/>
   <project groups="pdk" name="platform/external/abi-compliance-checker" path="external/abi-compliance-checker" revision="665ef2b0fe1ca1191118cd62c30045f08b086735"/>
   <project groups="pdk" name="platform/external/abi-dumper" path="external/abi-dumper" revision="6229d6100494c2a7d74271374f936babc33b5720"/>
   <project groups="pdk" name="platform/external/adhd" path="external/adhd" revision="0702ba2786f5bedc375b9b7c8120d212c02c08f6"/>
@@ -101,7 +101,7 @@
   <project groups="pdk" name="platform/external/caliper" path="external/caliper" revision="ab75cacdf76a3a519f4c53108a2576b6b2cf2f75"/>
   <project groups="pdk" name="platform/external/capstone" path="external/capstone" revision="6788a4139092f179005f7cdbf181ba24b60b6113"/>
   <project groups="pdk" name="platform/external/cblas" path="external/cblas" revision="ddf5f49cb53866fbc503a6349bf44bac24a6963d"/>
-  <project groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" revision="a0bd2f452b8ef9483c64d187f71718a31937bdbf"/>
+  <project groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" revision="39ae2a3b0c5c09ec838a663cf3cbcc0ab71d0c66"/>
   <project groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" revision="b2cf025c7d5cebd43084f38c6c7ff9cc17da428a"/>
   <project clone-depth="1" groups="pdk" name="platform/external/chromium-webview" path="external/chromium-webview" revision="790df009fd1fe6dab51902b0be57ad633b427a2c"/>
   <project groups="pdk" name="platform/external/clang" path="external/clang" revision="f9d2af42fc6d74c28893af371e4647158eaba66c"/>
@@ -113,13 +113,13 @@
   <project groups="pdk" name="platform/external/cros/system_api" path="external/cros/system_api" revision="7dfe7495d581c43e374b01ab9f78cce0093dd302"/>
   <project groups="pdk" name="platform/external/curl" path="external/curl" revision="8230e1366475e43b71057f5e3a4fed71295cab9f"/>
   <project groups="pdk" name="platform/external/dagger2" path="external/dagger2" revision="b1654fa03e7f43425c74644ca73d860198344d30"/>
-  <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" revision="758f54abd29522189a10b596ba143647428f9bc0"/>
+  <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" revision="949a9a0284e7429fb94e52c414e9446f5866a1fa"/>
   <project groups="pdk" name="platform/external/desugar" path="external/desugar" revision="301a69dfe6fbb59072b6c1af278ec31c10cbdf35"/>
   <project groups="pdk" name="platform/external/devlib" path="external/devlib" revision="8b170d2ed92ea3d771ce071e42dfff5fa32a66ae"/>
   <project groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" revision="10f9440631bc27789ad67c012827a95348542164"/>
   <project groups="pdk" name="platform/external/dhcpcd-6.8.2" path="external/dhcpcd-6.8.2" revision="b1e043e5fd15a8e93beb9dbe85100dddb62863eb"/>
   <project groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" revision="6661f3ca66b55d8f5a57b96fec97efaf8f3897a5"/>
-  <project groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" revision="4b2898b2176ce78a91e4bf52b966234aa96c11f3"/>
+  <project groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" revision="59be2e35adb455d7f3c398f8612655c473d7c8dd"/>
   <project groups="pdk" name="platform/external/dnsmasq" path="external/dnsmasq" revision="98697179a5a8daca8e20aa0ed44b89c1faff2a8d"/>
   <project groups="pdk" name="platform/external/doclava" path="external/doclava" revision="58979121f41a1f6100a24329bace6bef7a69df77"/>
   <project groups="pdk" name="platform/external/drm_gralloc" path="external/drm_gralloc" revision="5a1d7decd7bf60ba0c389687d2fc9210363eb922"/>
@@ -144,7 +144,7 @@
   <project groups="pdk" name="platform/external/flatbuffers" path="external/flatbuffers" revision="8d58e1d789080d23aec249fbb2aa4d3e7a50b2ef"/>
   <project groups="pdk" name="platform/external/fonttools" path="external/fonttools" revision="ee204a7eb6d914da12561942ae7fc5da7d2e0132"/>
   <project groups="pdk" name="platform/external/freetype" path="external/freetype" revision="f7b46c0241c54fb49f3072380a67107a6729daec"/>
-  <project groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="2edb366074e3c3ce4004f383ef20f598fd19769f"/>
+  <project groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="1a22d9458835d6d116e62bec7cade055c3ca1950"/>
   <project groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" revision="0ed4f31d5ced2432473aa7063bc1e28d990ff3f2"/>
   <project groups="pdk" name="platform/external/gflags" path="external/gflags" revision="b3d4316d069db49d52c2eaf6155941309128a0e9"/>
   <project groups="pdk,qcom_msm8x26" name="platform/external/giflib" path="external/giflib" revision="2655771fbcf80ef5cab8192b9409f697da9d8c0a"/>
@@ -160,7 +160,7 @@
   <project groups="pdk" name="platform/external/google-styleguide" path="external/google-styleguide" revision="749f7ae008c0d2dd9767fdfe202e6873e864a956"/>
   <project groups="pdk" name="platform/external/google-tv-pairing-protocol" path="external/google-tv-pairing-protocol" revision="c731915e80d9e2ccb755b97e7fdd280bbea07f70"/>
   <project groups="pdk" name="platform/external/googletest" path="external/googletest" revision="921be817eec95af0f321362c02554bd02b502ac7"/>
-  <project groups="pdk" name="platform/external/gptfdisk" path="external/gptfdisk" revision="9c50b5e176b95034b54d04856388ac3be6132076"/>
+  <project groups="pdk" name="platform/external/gptfdisk" path="external/gptfdisk" revision="23e1b5f0056aa34fda5083c9fa12446020108f50"/>
   <project groups="pdk" name="platform/external/guava" path="external/guava" revision="2e52c68711b104ac2e225a9d298bd2de1eed92bb"/>
   <project groups="pdk" name="platform/external/guice" path="external/guice" revision="628ced18e817a96c11857a51536468a886c6e183"/>
   <project groups="pdk" name="platform/external/hamcrest" path="external/hamcrest" revision="6668c743790380cb3e7889c2abb6cd53b720a211"/>
@@ -211,7 +211,7 @@
   <project groups="pdk" name="platform/external/libedit" path="external/libedit" revision="67e14dfc833aafa400a3aad8cb329cbaec503445"/>
   <project groups="pdk" name="platform/external/libese" path="external/libese" revision="f314bba6e9665c4789000447ee5d668f5481e99c"/>
   <project groups="pdk" name="platform/external/libevent" path="external/libevent" revision="f5930082c9827e9c3185ba104efacb5cbbaa76df"/>
-  <project groups="pdk" name="platform/external/libexif" path="external/libexif" revision="8f688823fc5399ab0f42ba2c8986cdd127dbde9b"/>
+  <project groups="pdk" name="platform/external/libexif" path="external/libexif" revision="dd36547c25e083ed3a51c718a754a4c6b70879ed"/>
   <project groups="pdk" name="platform/external/libffi" path="external/libffi" revision="bff6414035206420af02d4f54870f5ff6eff2780"/>
   <project groups="pdk" name="platform/external/libgsm" path="external/libgsm" revision="e775ffccfbedc4bb525cb2b5c9280a1dd0cfbe21"/>
   <project groups="pdk" name="platform/external/libhevc" path="external/libhevc" revision="d668223f689bcfec71a3f5c725178cf55b8b39cb"/>
@@ -287,7 +287,7 @@
   <project groups="pdk" name="platform/external/perfetto" path="external/perfetto" revision="310facd3c9d7c96e79c7e07a4444ed4f3bad04cd"/>
   <project groups="pdk" name="platform/external/piex" path="external/piex" revision="0aa61f9e866945145bf3dc21c1255190dedb78ef"/>
   <project groups="pdk" name="platform/external/ply" path="external/ply" revision="8b4275169c7b4efb46d034d409edac37b9b6df89"/>
-  <project groups="pdk" name="platform/external/ppp" path="external/ppp" revision="90da8c8f15db2c82aece6e4085aaf9c116d481f2"/>
+  <project groups="pdk" name="platform/external/ppp" path="external/ppp" revision="4f0b3ec45a0c698b11053d36cdd02eb12e8975dc"/>
   <project groups="pdk" name="platform/external/proguard" path="external/proguard" revision="45e52b5ab37a26149ce031caa44bb167da217667"/>
   <project groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="411501423307c29a160affef03485fd8000b3c1d"/>
   <project groups="pdk" name="platform/external/puffin" path="external/puffin" revision="7f8f0b1698dad1846a8ae3953b133b83617175bc"/>
@@ -351,7 +351,7 @@
   <project groups="pdk" name="platform/external/smali" path="external/smali" revision="68270cc4df9d462b53e4dd2e9395f698b792b2c8"/>
   <project groups="pdk" name="platform/external/snakeyaml" path="external/snakeyaml" revision="bccc0c9bc191e16560be107c78aa2d685e9077a4"/>
   <project groups="pdk" name="platform/external/sonic" path="external/sonic" revision="0acda6c822aba430d93044bbf2ebb9680b8969c2"/>
-  <project groups="pdk" name="platform/external/sonivox" path="external/sonivox" revision="9b162d775e923493bddaa64a68fbe4fc0ab2f6d0"/>
+  <project groups="pdk" name="platform/external/sonivox" path="external/sonivox" revision="d387b31df2b91e1d00444aff8f84854f3e9e543f"/>
   <project groups="pdk" name="platform/external/speex" path="external/speex" revision="978296a3d9b9c93891346842d3eb46de2ced4cc0"/>
   <project groups="pdk" name="platform/external/spirv-llvm" path="external/spirv-llvm" revision="63555c7bb790516c89f54d661dc8ea400dd8d2d7"/>
   <project groups="pdk" name="platform/external/sqlite" path="external/sqlite" revision="cf2720d733cbe0b87eb24d5d05a7a24dc2e32f38"/>
@@ -376,10 +376,9 @@
   <project groups="pdk" name="platform/external/turbine" path="external/turbine" revision="80375a9329669589dca4abd5228ad2366d8ff5f3"/>
   <project groups="pdk" name="platform/external/unicode" path="external/unicode" revision="a7d593b7d87545253a371b433dec0cba80edff06"/>
   <project groups="pdk" name="platform/external/v4l2_codec2" path="external/v4l2_codec2" revision="73c30583c55d24bee8b0da706f3c6c0e182e8ca9"/>
-  <project groups="pdk" name="platform/external/v8" path="external/v8" revision="7c433fc5a3494372148f2b164302fa86afed5650"/>
+  <project groups="pdk" name="platform/external/v8" path="external/v8" revision="061906f1260d14e8579a8253bc206bbd951b478d"/>
   <project groups="pdk" name="platform/external/valgrind" path="external/valgrind" revision="7d3f5da415f0f6ae3d79565ec5422019e4b32d9c"/>
   <project groups="vboot,pdk-fs" name="platform/external/vboot_reference" path="external/vboot_reference" revision="a2516840c8b010ae5176680877dede3d34e135df"/>
-  <project groups="pdk" name="platform/external/virglrenderer" path="external/virglrenderer" revision="79cfc469bfea21ff243deae929189e016295e2bb"/>
   <project groups="pdk" name="platform/external/vixl" path="external/vixl" revision="d971e646c03e302ea711012285d39fcb15b6cf44"/>
   <project groups="pdk" name="platform/external/vogar" path="external/vogar" revision="ccf18e064e312377067bdfea746ec85f8375f19a"/>
   <project groups="pdk" name="platform/external/volley" path="external/volley" revision="c3a0e7848f09ade3a05d9d23a52d1cf21373a841"/>
@@ -399,19 +398,19 @@
   <project groups="pdk" name="platform/external/zlib" path="external/zlib" revision="b30b23d7ddb26f452c31fe8b28ebc59e5639ec3f"/>
   <project groups="pdk" name="platform/external/zopfli" path="external/zopfli" revision="4101d743cef9e1161bfc9ed4d3c8d4910c6346f7"/>
   <project groups="pdk" name="platform/external/zxing" path="external/zxing" revision="eb95fad99b1c163e20b9ffc54a2346e650451e9d"/>
-  <project groups="pdk" name="platform/frameworks/av" path="frameworks/av" revision="a968e3a45cf31566771e1b4cc5b5a3c50c0450ff"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" revision="5f2704447e29f87be8f7e261c620a62bcf8748de"/>
+  <project groups="pdk" name="platform/frameworks/av" path="frameworks/av" revision="8edc0184d554339daff93d3e2af0fa74e2bf23fd"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" revision="ee7372115faeb97a8e0eccc734bf1d6fa796850b"/>
   <project groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" revision="cd2cedc31a5a051062c87e1c215623acc3da5de8"/>
   <project groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" revision="708894db646abf1eccd08a7dfaadbb66a7d2b283"/>
   <project groups="pdk" name="platform/frameworks/compile/slang" path="frameworks/compile/slang" revision="738e2ea6c545aab88ae8d6aa2c93f214c71a03cf"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/data-binding" path="frameworks/data-binding" revision="a53fdf4a28693a8ebbc5d3fef1e44423a560dc90"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ex" path="frameworks/ex" revision="49018cff8ac5c5cad9401f472fc54044b5702d99"/>
   <project groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" revision="0f6d776dddcf75046e6a28f2945b70c77c808459"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/layoutlib" path="frameworks/layoutlib" revision="66d9e2aba243ebf28926528651d4d299d2121ac5"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/layoutlib" path="frameworks/layoutlib" revision="4bc31224abea42479e743686d03cee4f75ca9924"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/minikin" path="frameworks/minikin" revision="e2c7e890cc943654dbcecc1b9577a37297b76db3"/>
   <project groups="pdk" name="platform/frameworks/ml" path="frameworks/ml" revision="8f3ca3532cdcb69315721c92c1eef3240595e8ce"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/multidex" path="frameworks/multidex" revision="475db106115d4f25f0e41612a2a71a0cfe83ab38"/>
-  <project groups="pdk" name="platform/frameworks/native" path="frameworks/native" revision="0eaf56f0a7f416b85440871cb27f27e15536bd16"/>
+  <project groups="pdk" name="platform/frameworks/native" path="frameworks/native" revision="c79dbb5de2b312e5663cd598c0a6b38a8765626f"/>
   <project groups="pdk-fs" name="platform/frameworks/opt/bitmap" path="frameworks/opt/bitmap" revision="3959d1a32179a67fbea303d99edfc17803aafc0f"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/calendar" path="frameworks/opt/calendar" revision="c0246198be80c6a8185aba01707e3c6ecba21222"/>
   <project groups="pdk-fs" name="platform/frameworks/opt/car/services" path="frameworks/opt/car/services" revision="38d8dcf2e7e3122fc2616bb9b7cb9d1d660dd263"/>
@@ -425,17 +424,17 @@
   <project groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" revision="68d27823460be69eedf43b6871456d9cf8d6e1b4"/>
   <project groups="pdk-fs" name="platform/frameworks/opt/net/lowpan" path="frameworks/opt/net/lowpan" revision="e6a24c74c6eceeebb3277206b7dc979dc932440d"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" revision="2ce9e1544377e36cd9a03a9d7aa809911aa735a3"/>
-  <project groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" revision="2cf650960a3012ee77e1beb9b6e9227500f618da"/>
+  <project groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" revision="ea9509af81e17c92a8825ed00896de94928cc198"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/photoviewer" path="frameworks/opt/photoviewer" revision="ce775960c5dfde23063d8e4155a89cf66b5d879f"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/setupwizard" path="frameworks/opt/setupwizard" revision="74165808e66aa86e3ae3993bb6dd008ba53a1414"/>
-  <project groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="0a229edef5d0b894caccf033d7d3c8a106ab1747"/>
+  <project groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="1e79f8c7e4026c7b66218fceeef2175f16895839"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" revision="49b585fd1d676afd07801988019a86310fec4111"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" revision="590c2f926c00e0ba19cbad748777cb2e791c0069"/>
   <project groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" revision="bdd76befd3e066e31c9fff2ce651b7378b1a7283"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" revision="1d38b0553dd4886c130902b2aba6939d311cbb15"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="85565cf4a3eba2506b99728e2bf7d90e2cfd6c8f"/>
   <project groups="pdk" name="platform/hardware/akm" path="hardware/akm" revision="b8b06ce000306a7ecb418840d32e90b27dd76a71"/>
-  <project groups="amlogic,amlogic-core" name="platform/hardware/amlogic" path="hardware/amlogic" revision="0a3bfd7f14e67beb780110aa595314fbac2cdb53"/>
+  <project dest-branch="p-tv-dev" groups="amlogic,amlogic-core" name="platform/hardware/amlogic" path="hardware/amlogic" revision="0a3bfd7f14e67beb780110aa595314fbac2cdb53"/>
   <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="c120f3379f85c74b061bdaabdb56bb7a758369bd"/>
   <project groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="6d35cbed8755935ec2c3cea480e7c72899ed8e1c"/>
   <project groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" revision="50222ad75ae807c7e5ab45212f562b09bd4f1eb6"/>
@@ -456,9 +455,9 @@
   <project groups="intel,pdk" name="platform/hardware/intel/img/psb_headers" path="hardware/intel/img/psb_headers" revision="fcb44a02bf27c4eb1fdbff2f259756c42306152c"/>
   <project groups="intel,pdk" name="platform/hardware/intel/img/psb_video" path="hardware/intel/img/psb_video" revision="ad58446b55e9c44a4814f3ac83b679d93ab05b04"/>
   <project groups="intel_sensors,pdk" name="platform/hardware/intel/sensors" path="hardware/intel/sensors" revision="68dc9e70b79dacddc4e0bf00af0de7f764b04eed"/>
-  <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" revision="7dc83db3436eb1266baf3317845e05351bb0b743"/>
+  <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" revision="3d23c5ad8a1b088906cd0c0448897c17c90328d7"/>
   <project groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" revision="a8e01ac3a98bd2d5cfa2eaa60c50afd07decf3b4"/>
-  <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" revision="c306933fd782c223db8d4b32158d89fd8ebd958c"/>
+  <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" revision="3d3cc8186b2ff6e29df7bc0ea0eee6bcae565372"/>
   <project groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="8c64fe9b126d6e50ea12f0dd02b5d4716392e076"/>
   <project groups="marvell_bt,pdk" name="platform/hardware/marvell/bt" path="hardware/marvell/bt" revision="3f33d194e8300816b94d1d7b68b1d48c8f903251"/>
   <project groups="pdk" name="platform/hardware/nxp/nfc" path="hardware/nxp/nfc" revision="8a6b6d8b79c98a334c27b2e87159639b8f6e0f42"/>
@@ -466,7 +465,7 @@
   <project groups="qcom,qcom_audio,pdk-qcom" name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="05ab6718dddc8de250d4c2e78abf772d7617242c"/>
   <project groups="pdk-qcom" name="platform/hardware/qcom/bootctrl" path="hardware/qcom/bootctrl" revision="c19680b4a9eaf1ba04a35e47d9504d3f18fcc689"/>
   <project groups="qcom,pdk-qcom" name="platform/hardware/qcom/bt" path="hardware/qcom/bt" revision="6d726dbcca7d0b5d1f8b338bc0279539c2b9deb0"/>
-  <project groups="qcom_camera,pdk-qcom" name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="b4dea67d896c1d480615473a8a5c2a8b0fe57d01"/>
+  <project groups="qcom_camera,pdk-qcom" name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="1a1c246364664675411a0d2f72cf4ace28431fa1"/>
   <project groups="qcom,pdk-qcom" name="platform/hardware/qcom/data/ipacfg-mgr" path="hardware/qcom/data/ipacfg-mgr" revision="97f14db35c17e2ae0591519099d5ee67e23918e9"/>
   <project groups="pdk-qcom,qcom,qcom_display" name="platform/hardware/qcom/display" path="hardware/qcom/display" revision="e11a7bc424f2d811e27efa93eb4506e6e9ab6faf"/>
   <project groups="qcom,qcom_gps,pdk-qcom" name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="6238014684722a6c9ebf7941f3ff428f73cdd973"/>
@@ -483,13 +482,13 @@
   <project groups="qcom_wlan,pdk-qcom" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="b924e53d513855100473eca82b2e740d1f67c9f4"/>
   <project groups="pdk" name="platform/hardware/ril" path="hardware/ril" revision="0a6913ee3bebd30b6f480f25f90460b9bf853e89"/>
   <project groups="pdk" name="platform/hardware/st/nfc" path="hardware/st/nfc" revision="5b9b2fbcd8517cfd8b9de3229c24fabbcb22ad6c"/>
-  <project groups="pdk" name="platform/libcore" path="libcore" revision="4db451b6be37ad9cd9db48160e09576e25a72bae"/>
+  <project groups="pdk" name="platform/libcore" path="libcore" revision="326b1f39cf5de716b6dc381ed013ed282e60db0f"/>
   <project groups="pdk" name="platform/libnativehelper" path="libnativehelper" revision="6b56b692bc74a19f293e378c0dffea15460f4870"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" revision="549bd22bf007870fed0593bf2916382a5e6fd0be"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="71ef2c38c4ea8f77cdaf861bad17338db835b0d4"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="1a7436557e5191f0611704fe6fa426c5184edef9"/>
   <project groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" revision="d44f46c37f1c5226477c13c39ebfb438d8f262eb"/>
   <project groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="956525423e51315015d6902e3b9487e72e9f4885"/>
-  <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" revision="7a45220749099d7b7661df67137f4edf798a7162"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" revision="dbeed5f3962e24d0c8cf2078ccee167c9d3ee694"/>
   <project groups="pdk-fs" name="platform/packages/apps/Car/Dialer" path="packages/apps/Car/Dialer" revision="f8a989b40fc1018eeee45c6d7976c5d4ac9acee3"/>
   <project groups="pdk-fs" name="platform/packages/apps/Car/Hvac" path="packages/apps/Car/Hvac" revision="b425ac401acf69a63598981d701342df88c82690"/>
   <project groups="pdk-fs" name="platform/packages/apps/Car/LatinIME" path="packages/apps/Car/LatinIME" revision="7f5e96c347ca60f39871ab9976c12a28f514e5de"/>
@@ -506,10 +505,10 @@
   <project groups="pdk-fs" name="platform/packages/apps/Car/UserManagement" path="packages/apps/Car/UserManagement" revision="9391baedbf4ad645d7c125279a19d7a2b6b285f9"/>
   <project groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" revision="afa55a3065ea0878e11a9124b8a458bf66b5fae2"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" revision="09ee2986d622c7780741a1890943d4cf50f45539"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="2eba9dbf6234ee46e82103b70402d445cd9facce"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="326e5062bf44357cc9b01d6874af06c22444b9f5"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="5848fd8c56ebbbc346434b7b4098b14981f094c8"/>
-  <project groups="pdk-fs" name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="1e75efc563a847a8d1d5668af47a96f04610a55f"/>
-  <project groups="pdk-fs" name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="ac92585d9d05bebe261cde1efdd6b69d66960606"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="fa2efb978868f5113d454e0b556ea21878922e2a"/>
+  <project groups="pdk-fs" name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="c22c3654b8a1a1208bc10a6c856e7ffe6c2e93d5"/>
   <project groups="pdk" name="platform/packages/apps/DevCamera" path="packages/apps/DevCamera" revision="90fdbf7460fbd255194455331c6a38a7b8f41dd2"/>
   <project groups="pdk-fs" name="platform/packages/apps/Dialer" path="packages/apps/Dialer" revision="ae8d63ab1d7da7d96e5865a9a9ae2d5fcc8dbab8"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/DocumentsUI" path="packages/apps/DocumentsUI" revision="415c21bd6090e420f85831a5c64e74cd0f3f9d63"/>
@@ -527,7 +526,7 @@
   <project groups="pdk-fs" name="platform/packages/apps/Messaging" path="packages/apps/Messaging" revision="40c8dd7d7d8e28aee6ba65185bb94dbeff5974a6"/>
   <project groups="pdk-fs" name="platform/packages/apps/Music" path="packages/apps/Music" revision="41b4991539e61f6203ce226311300b06b781ad24"/>
   <project groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" revision="d282aceedf29d6162c3f903ccfcd1fe3706b3131"/>
-  <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="01fe10d15cb79721945dcfc655a5e3f6fbf77aab"/>
+  <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="d795f7f54e1b48096278a3b08a889ac3933cb7a1"/>
   <project groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" revision="0cd160be02bd381e8d84800128c7092a946be95b"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="a20628ec4bc9dcceb4feab9775f56a9318dc1a3c"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" revision="7687de62823d61f3ab8a996efa40fee6f71a6da4"/>
@@ -536,7 +535,7 @@
   <project groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="40adfa9388338ffbfabd5e295387514b007eb21e"/>
   <project groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" revision="a72c4b4996818c57c8db002a8fa0c5e17a41766a"/>
   <project groups="apps_se,pdk-fs" name="platform/packages/apps/SecureElement" path="packages/apps/SecureElement" revision="e39db91a6e8901ad8a1c0710793beabb882c4487"/>
-  <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="395a9056240a1e7f7fc36b5357b38aea9bd2aeb2"/>
+  <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="a9f7c7ebbac81702fec563db5ddfa5d307124cdf"/>
   <project groups="pdk-fs" name="platform/packages/apps/SettingsIntelligence" path="packages/apps/SettingsIntelligence" revision="a59134c149fb99136ca0103bb366d5e39662a4ec"/>
   <project groups="pdk-fs" name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="0f64cc38e2a2c4d7cc020a6821f4956b333ad62c"/>
   <project groups="pdk-fs" name="platform/packages/apps/SpareParts" path="packages/apps/SpareParts" revision="1067dc8f999729f3588cbdbb5ee01ec090297d09"/>
@@ -549,7 +548,7 @@
   <project groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" revision="1bc4d5cf4141663466521800e7c43e790eb33e59"/>
   <project groups="pdk" name="platform/packages/apps/TimeZoneUpdater" path="packages/apps/TimeZoneUpdater" revision="1c28e0d1964ec6df7dd2c4205802766164ceeefa"/>
   <project groups="pdk-fs" name="platform/packages/apps/Traceur" path="packages/apps/Traceur" revision="88274e0e4f94a93c7e6f82dc9b9cd5a46378f925"/>
-  <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" revision="cce8f96414c1c38ca0e42db73e925a74f7671709"/>
+  <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" revision="6b370700f3d05dccbce271b813d024581db55508"/>
   <project groups="pdk-fs" name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail" revision="62af8a9ec750a17643413d0f7ac97a9fe1bdcb1e"/>
   <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" revision="db3426b874c2b6ad67770309b5e26291193a9ace"/>
   <project groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="50faaa09c2a1a9f91c0e8fa97e4ff060bc50a23a"/>
@@ -574,58 +573,58 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" revision="af153958678a5f8f7b9e0cc2f2a79916ee24fec2"/>
   <project groups="pdk-fs" name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation" revision="83c1d9346149bb1615328a13d15873a455754633"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Rcs" path="packages/services/Rcs" revision="16294256b1b2f2b6c369347122defb1bddcef5ca"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" revision="f5ab011bb5dd85717cf037428d0507ceb2499218"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" revision="db16c51af20e03e749e01ec13ac1ebf6fa90337a"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" revision="41e3839ebe0edc176c7c6ae5e3101a8f058c50ae"/>
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" revision="475ff44fe4f64da6727590248d4f04272bd37a04"/>
   <project groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="e218e93db16b51891b2b5ef87e12fd9691f24447"/>
   <project groups="pdk" name="platform/pdk" path="pdk" revision="081b4c19c5af22ab7ed780d8565bfe5fb5e57732"/>
   <project groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" revision="87349770cabc102f025f4f89ee6f92efc248e2f3"/>
-  <project groups="pdk-fs" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" revision="ad888d666b752c7a2696e9bee1b7880b9a9ea9aa"/>
-  <project groups="pdk-fs" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" revision="6b55895ba988212b77b8ca7721cd1be35cf21cbb"/>
-  <project groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" revision="ba5dcdbe11bb88528cdd348b474f1044b5e89401"/>
-  <project groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="e307a55a8188b407890491357cb841ade54bbf47"/>
-  <project groups="pdk" name="platform/prebuilts/checkcolor" path="prebuilts/checkcolor" revision="ec3da48f25a3df5ae2ea605dba909a61172d0922"/>
-  <project groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="a098a2873549a4d5eaf0b7c6fc77ee79edf349a5"/>
-  <project groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="c4a57a99d0807b4a34aeddf498ce41f12f28df85"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="ad283bfcf26c5a666a8c9ee6f07ecc39847acb3c"/>
-  <project groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="7cc15581e325e624a5634ee5d432a38111d2538f"/>
-  <project groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" revision="12df9ac4945ef9c49e71018b13c5a33cc779063b"/>
-  <project groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" revision="a84d3265d3eb5d892729dca13e65a9f00c905242"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="0e23a2691952730edee7b3cd6b0884bca633cebf"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="781171eb5952accee13ba412b4bd797a5a57d193"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="d942564c9331f07026a8f78502d8571206eb7be4"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="6931c382e786f58ce8944f2468eb6e48082f3aba"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="0d76fe448c221c8f5153c6e8d0073dae351ed157"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="7c9b7a4ae122a9ad595cfc9e9479884bc1666e7f"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="2ccb38af8c940f1feef62ff5986f4bbc5d899e66"/>
-  <project groups="pdk-fs" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="e76a9a506d7ad132f107eb2f7c27b6a8ccb68b91"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="388fdc4995d374d76a0c4b292afabac91638e134"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="a137b149dc4eecca65e037457b4809da38ea8f77"/>
-  <project groups="darwin" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" revision="0a8c90248264a8b26970b4473770bcc3df8515fe"/>
-  <project groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="ee04cf91e69ed1ea9cb2e00c5a4764f6b67c4175"/>
-  <project groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="a837bae4a621488cae19d70945e59b6334bc670d"/>
-  <project groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" revision="b8d264ce5292341fe1c92633b60ca05c2ea0560d"/>
-  <project groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="13f5a7554ae77bf3cd959445646ecb485a670d3a"/>
-  <project groups="pdk" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="766de069c8010c6b03b265a91a9a24e5e1983ffa"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/libs/libedit" path="prebuilts/libs/libedit" revision="d32685dba4011664b590b94ad156bc734c2c9bb5"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" revision="e114eb1538ededa5bd631be442493c17a0a595b7"/>
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/bumptech" path="prebuilts/maven_repo/bumptech" revision="d166742cdd6eab44d07fdb7be1d271ceb0b73a17"/>
-  <project groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" revision="d168839b3041a2033593e426ebb08e23c4abeee5"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="5a5968849d605c124aa30f964a250c3485338d4a"/>
-  <project groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63"/>
-  <project groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="5bcc5eb23dbb00d5e5dbf75835aa2fb79e8bafa2"/>
-  <project groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="bb0f1f89f7225a16a9c80e907646ebe26fcef090"/>
-  <project groups="pdk" name="platform/prebuilts/r8" path="prebuilts/r8" revision="00a4aae8d6f0d50583070b8cf06a408e310380d4"/>
-  <project groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="188d46d9fbcb5fa4a277cd44737917799d994b03"/>
-  <project groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="996c9be391c89688d0362a231804f17049eb962c"/>
-  <project groups="pdk" name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27" revision="bd9e836e2699fbb9c45a7864e9ee25af1b68d2d4"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" revision="ad888d666b752c7a2696e9bee1b7880b9a9ea9aa"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" revision="6b55895ba988212b77b8ca7721cd1be35cf21cbb"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" revision="ba5dcdbe11bb88528cdd348b474f1044b5e89401"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="e307a55a8188b407890491357cb841ade54bbf47"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/checkcolor" path="prebuilts/checkcolor" revision="ec3da48f25a3df5ae2ea605dba909a61172d0922"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="a098a2873549a4d5eaf0b7c6fc77ee79edf349a5"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="c4a57a99d0807b4a34aeddf498ce41f12f28df85"/>
+  <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="ad283bfcf26c5a666a8c9ee6f07ecc39847acb3c"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="7cc15581e325e624a5634ee5d432a38111d2538f"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" revision="12df9ac4945ef9c49e71018b13c5a33cc779063b"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" revision="a84d3265d3eb5d892729dca13e65a9f00c905242"/>
+  <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="0e23a2691952730edee7b3cd6b0884bca633cebf"/>
+  <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="781171eb5952accee13ba412b4bd797a5a57d193"/>
+  <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e"/>
+  <project clone-depth="1" groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="d942564c9331f07026a8f78502d8571206eb7be4"/>
+  <project clone-depth="1" groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="6931c382e786f58ce8944f2468eb6e48082f3aba"/>
+  <project clone-depth="1" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="0d76fe448c221c8f5153c6e8d0073dae351ed157"/>
+  <project clone-depth="1" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="7c9b7a4ae122a9ad595cfc9e9479884bc1666e7f"/>
+  <project clone-depth="1" groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="2ccb38af8c940f1feef62ff5986f4bbc5d899e66"/>
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="e76a9a506d7ad132f107eb2f7c27b6a8ccb68b91"/>
+  <project clone-depth="1" groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="388fdc4995d374d76a0c4b292afabac91638e134"/>
+  <project clone-depth="1" groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="a137b149dc4eecca65e037457b4809da38ea8f77"/>
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" revision="0a8c90248264a8b26970b4473770bcc3df8515fe"/>
+  <project clone-depth="1" groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="ee04cf91e69ed1ea9cb2e00c5a4764f6b67c4175"/>
+  <project clone-depth="1" groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="a837bae4a621488cae19d70945e59b6334bc670d"/>
+  <project clone-depth="1" groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" revision="b8d264ce5292341fe1c92633b60ca05c2ea0560d"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="13f5a7554ae77bf3cd959445646ecb485a670d3a"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="766de069c8010c6b03b265a91a9a24e5e1983ffa"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/libs/libedit" path="prebuilts/libs/libedit" revision="d32685dba4011664b590b94ad156bc734c2c9bb5"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" revision="e114eb1538ededa5bd631be442493c17a0a595b7"/>
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/bumptech" path="prebuilts/maven_repo/bumptech" revision="d166742cdd6eab44d07fdb7be1d271ceb0b73a17"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" revision="d168839b3041a2033593e426ebb08e23c4abeee5"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="5a5968849d605c124aa30f964a250c3485338d4a"/>
+  <project clone-depth="1" groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63"/>
+  <project clone-depth="1" groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="5bcc5eb23dbb00d5e5dbf75835aa2fb79e8bafa2"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="bb0f1f89f7225a16a9c80e907646ebe26fcef090"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/r8" path="prebuilts/r8" revision="00a4aae8d6f0d50583070b8cf06a408e310380d4"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="188d46d9fbcb5fa4a277cd44737917799d994b03"/>
+  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="996c9be391c89688d0362a231804f17049eb962c"/>
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27" revision="bd9e836e2699fbb9c45a7864e9ee25af1b68d2d4"/>
   <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" revision="ff3c39e8a6204096cf4e532b50bfc9bc6c290e3b"/>
-  <project groups="pdk" name="platform/system/bt" path="system/bt" revision="4c763ca7b8eaae3933adac3d9b7f9ff511427f41"/>
+  <project groups="pdk" name="platform/system/bt" path="system/bt" revision="ea2c40320d4b5ae05dbc0fe345323fcc73fb9c96"/>
   <project groups="pdk" name="platform/system/ca-certificates" path="system/ca-certificates" revision="e666d121b84f5131f2095830838bc4f108ae874f"/>
   <project groups="pdk" name="platform/system/chre" path="system/chre" revision="689b1b8f4967645ceda8158668dde599a3350de3"/>
-  <project groups="pdk" name="platform/system/connectivity/wificond" path="system/connectivity/wificond" revision="0bb07bad3aa062a837cf4695ac842936dc55ca05"/>
+  <project groups="pdk" name="platform/system/connectivity/wificond" path="system/connectivity/wificond" revision="8970401ac31b90a6cfe297e106d155052a9b7b1d"/>
   <project groups="pdk" name="platform/system/connectivity/wifilogd" path="system/connectivity/wifilogd" revision="9f9c941ff397771936ee8cd91be4909057ae372e"/>
-  <project groups="pdk" name="platform/system/core" path="system/core" revision="ebef0afdf70f45acfb14a3b7182b0786a00b5aa1"/>
+  <project groups="pdk" name="platform/system/core" path="system/core" revision="b69459eccb8d5d5e094663e8ccdc9bfea8a4e79f"/>
   <project groups="pdk" name="platform/system/extras" path="system/extras" revision="c374e57aaf5c069670af4e58d560b57cb3549f8f"/>
   <project groups="pdk" name="platform/system/gatekeeper" path="system/gatekeeper" revision="2fbb743bb49c385337d458a418fe604e0623ca6c"/>
   <project groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" revision="febc1e8735888d8331188d1b54388f2a2c33614d"/>
@@ -637,11 +636,11 @@
   <project groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" revision="835bd46b3d9a05434341a9420e558d506184ada7"/>
   <project groups="pdk" name="platform/system/libufdt" path="system/libufdt" revision="4b00a3297b10c42924687b1a058efc92bef4b539"/>
   <project groups="pdk" name="platform/system/libvintf" path="system/libvintf" revision="8dffc06738c48ed6d9a3376a7af1447150b0e825"/>
-  <project groups="pdk" name="platform/system/media" path="system/media" revision="76e32e49e2d8aebf1d4d860f0e1adbaec6fb2720"/>
-  <project groups="pdk" name="platform/system/netd" path="system/netd" revision="b4a878810f02164aa85b9a38ba115aef37ab02cc"/>
-  <project groups="pdk" name="platform/system/nfc" path="system/nfc" revision="79d4646141a02db467fab4eaa9a19406b04783a1"/>
+  <project groups="pdk" name="platform/system/media" path="system/media" revision="b5c5c8ff9b58385c8905bed4085bc8492b7c8993"/>
+  <project groups="pdk" name="platform/system/netd" path="system/netd" revision="98e1567442083685a7b976f85c1cdf99bc0722a3"/>
+  <project groups="pdk" name="platform/system/nfc" path="system/nfc" revision="2fbc16529afe2e9cadc71aa46e5d8ef6128c0658"/>
   <project groups="pdk" name="platform/system/nvram" path="system/nvram" revision="6c246ace0160aedf62a7e699e1ccef51e1d12a01"/>
-  <project groups="pdk" name="platform/system/security" path="system/security" revision="36ad6286e945a09f89424b95884fe131ce62516e"/>
+  <project groups="pdk" name="platform/system/security" path="system/security" revision="04ae235f08960abdca2ad2640f9d7621ac08e8d8"/>
   <project groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" revision="90dbe580e6300a6b9943c9dbf9bb76c8cf834fc8"/>
   <project groups="pdk" name="platform/system/timezone" path="system/timezone" revision="04f6ce3633d6c8e909a07a78df81b08c0236714b"/>
   <project groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" revision="b06c82923869f50e9641f7dac56df0aebe637845"/>
@@ -649,38 +648,39 @@
   <project groups="pdk" name="platform/system/update_engine" path="system/update_engine" revision="0cbfe7ec128b4d0418c0548ad10613f48cbf3438"/>
   <project groups="pdk" name="platform/system/vold" path="system/vold" revision="bca70d9421e9d88cf874b3172c9157c05f7c3d4a"/>
   <project groups="vts,pdk" name="platform/test/framework" path="test/framework" revision="1bc714231c6a96b763e58ffddb1e65a72d443c3d"/>
-  <project groups="sts,pdk" name="platform/test/sts" path="test/sts" revision="b02ed8eea8ec73cd375fb473098b808cce237149"/>
-  <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/test/suite_harness" path="test/suite_harness" revision="9b88e81c01488e116a9d35087f009a4c92996896"/>
+  <project groups="sts,pdk" name="platform/test/sts" path="test/sts" revision="ddc45c03fc47552203d8e1cc64ac4800e397e532"/>
+  <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/test/suite_harness" path="test/suite_harness" revision="b0d4cd8bb4905c618527fd4d9e3b6bc3538fff6c"/>
   <project groups="vts,pdk" name="platform/test/vti/alert" path="test/vti/alert" revision="2270d160e38f0623d708cce36754fe14168dce64"/>
   <project groups="vts,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" revision="3d4e38112f0e41994d2de0c2159c3deff99c367a"/>
   <project groups="vts,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" revision="e5bcc336b6b8bb7826e791cf608bf0efbb32a2ed"/>
   <project groups="vts,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" revision="f19e2d7a50060ac44bc2f795c474191c6172da89"/>
-  <project groups="vts,pdk" name="platform/test/vts" path="test/vts" revision="1ccc5672131f2da1401fddc7e1b357ec30d778e8"/>
+  <project groups="vts,pdk" name="platform/test/vts" path="test/vts" revision="dfb78a0a961ff4afaf4b1476c2d9fcde7fcf34b3"/>
   <project groups="vts,pdk" name="platform/test/vts-testcase/fuzz" path="test/vts-testcase/fuzz" revision="4752609022e5b31a226a616bd173f3b29aa5af82"/>
-  <project groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" revision="199e816e71b4b6e863f885b04959698472ea7c1d"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" revision="f76765cf62d1c5890092201e1e8252ec55ed6218"/>
   <project groups="vts,pdk" name="platform/test/vts-testcase/hal-trace" path="test/vts-testcase/hal-trace" revision="260dfffd16a180ac1d278b6bb43d8fefadbb7460"/>
-  <project groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" revision="6e81ff3a5b1d5637c4899c119e1ccf7f4cb07b3a"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" revision="5f01dbc043eddb7a00aa9661cf4970249ae0741c"/>
   <project groups="vts,pdk" name="platform/test/vts-testcase/nbu" path="test/vts-testcase/nbu" revision="f6d81dba4c1b0cf133a83aaf434e5b3015af549d"/>
   <project groups="vts,pdk" name="platform/test/vts-testcase/performance" path="test/vts-testcase/performance" revision="45000704136b657e7038e6c062e7285de55830ac"/>
   <project groups="vts,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" revision="e52ed2e97c2e093f1b865a4b4982262f671576a0"/>
-  <project groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" revision="4e7179517d35a484f0b486a6ea2184566a3a86d6"/>
+  <project groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" revision="ad17797cd87aa1eb1f6ef78176e8a5f3dbf2c143"/>
   <project groups="tools,vts,pdk,tradefed" name="platform/tools/acloud" path="tools/acloud" revision="c8f273c3621c24b31b3342a7a587cc063ad5e63e"/>
   <project groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" revision="2a59daeb9f6442a37ae0d70efcbe5f849af13eab"/>
   <project groups="pdk,tradefed" name="platform/tools/apkzlib" path="tools/apkzlib" revision="09728673a6dcd4d9623538c2a5cc39fb97def6af"/>
   <project groups="tools,pdk-fs" name="platform/tools/dexter" path="tools/dexter" revision="d803fdf37ea8b313360283f6baa965be2d01c36c"/>
   <project groups="nopresubmit,pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" revision="d19681888cba6949c35f63d9a2518ab0814def73"/>
   <project groups="pdk,tools" name="platform/tools/metalava" path="tools/metalava" revision="0889822603001c4030a7c0c3c60e72a82194277c"/>
-  <project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="2b68127d6634c9b6e7da53bb6b7bec8ce4e3ca4a"/>
+  <project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="cf7c9848a8de520f1ef4e9a1432fe00dd47ee58c"/>
   <project groups="pdk" name="platform/tools/test/connectivity" path="tools/test/connectivity" revision="3bc66fe900f9d6e8e975c5c4e454a158e503fcfc"/>
-  <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" revision="b9dd57b9e716d7008d48521d7bc1b3163ab4e566"/>
+  <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" revision="30f552c1426eb56a801037dc17f47dad5d781e8d"/>
   <project groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" revision="699c23c61e753c79088c2708f2abaddadb845cde"/>
   <project groups="tools,vendor,pdk" name="platform/tools/vendor/google_prebuilts/arc" path="tools/vendor/google_prebuilts/arc" revision="3ec3fac47d53319db91c849f09d0692cd748ab8b"/>
-  <project groups="vendor,amlogic,ampere,askey,atom,beast,darwin,deadpool,harman,sei" name="platform/vendor/amlogic/common" path="vendor/amlogic/common" revision="1d0da5c322710f5d548075a001bcdd9b468b50c2"/>
-  <project groups="pdk" name="platform/vendor/google_gtvs" path="vendor/google_gtvs" revision="05e9c499d5419e6d80b863bb00b1d092ed409150"/>
-  <project groups="vendor,google_testing_comms" name="platform/vendor/google_testing/comms" path="vendor/google_testing/comms" revision="afc877b992f77fa3af6a91e96cec6983894e108c"/>
+  <project dest-branch="p-tv-dev" groups="vendor,ampere,amlogic" name="platform/vendor/amlogic/ampere" path="vendor/amlogic/ampere" revision="71b4f185929fa2f9793bddd97428bebfe93d712c"/>
+  <project dest-branch="p-tv-dev" groups="vendor,amlogic,ampere,askey,atom,beast,darwin,deadpool,harman,sei" name="platform/vendor/amlogic/common" path="vendor/amlogic/common" revision="1d0da5c322710f5d548075a001bcdd9b468b50c2"/>
+  <project dest-branch="p-tv-dev" groups="vendor,darwin,amlogic" name="platform/vendor/amlogic/darwin" path="vendor/amlogic/darwin" revision="2450a6ea775be578ef9f81e1223afe0146f01d22"/>
+  <project dest-branch="p-tv-dev" groups="vendor,franklin,amlogic" name="platform/vendor/amlogic/franklin" path="vendor/amlogic/franklin" revision="01746a5ef21a2b3a3dae07e44512fc6f034b10fe"/>
+  <project groups="pdk" name="platform/vendor/google_gtvs" path="vendor/google_gtvs" revision="92406c2aa32cd7b283ddcada2af89bf089ec271a"/>
   <project groups="vts,pdk" name="platform/vendor/google_vts" path="vendor/google_vts" revision="ee0cfe24a75a529dcb1885f30edaa884669fb649"/>
-  <project groups="vendor,harman,atom" name="platform/vendor/harman/atom" path="vendor/harman/atom" revision="a00ba6a0aeb7295008471896b852ed04dc237e04"/>
-  <project groups="vendor,widevine" name="platform/vendor/widevine" path="vendor/widevine" revision="1103fe233e68b64d085c2f06cad45710dc1e3f3c"/>
+  <project groups="vendor,widevine" name="platform/vendor/widevine" path="vendor/widevine" revision="d3c0d4cd5654527ef5b6d14ed372cf938da1337b"/>
   <project groups="pdk" name="toolchain/binutils" revision="15d7fe529a4fc80dcbb21306e55cb55f7ec1cf4a"/>
   <project groups="pdk" name="toolchain/pgo-profiles" revision="d6524df01afb15ba2a22d6bc65ac91aa7770042d"/>
   
diff --git a/google_partner_ref.xml b/google_partner_ref.xml
index 84a691b..189beef 100755..100644
--- a/google_partner_ref.xml
+++ b/google_partner_ref.xml
@@ -84,22 +84,22 @@
   <remove-project name="platform/hardware/qcom/wlan" />
   <remove-project name="platform/prebuilts/android-emulator" />
   <remove-project name="platform/prebuilts/abi-dumps/vndk" />
-
+  
   <!--remove amlogic related gits, otherwise will cause conflict-->
   <remove-project name="device/amlogic/common" />
-  <remove-project name="device/harman/atom" />
-  <remove-project name="device/harman/atom-kernel" />
+  <remove-project name="device/amlogic/ampere" />
+  <remove-project name="device/amlogic/ampere-kernel" />
+  <remove-project name="device/amlogic/darwin" />
+  <remove-project name="device/amlogic/darwin-kernel" />
+  <remove-project name="device/amlogic/franklin" />
+  <remove-project name="device/amlogic/franklin-kernel" />
   <remove-project name="platform/hardware/amlogic" />
   <remove-project name="platform/vendor/amlogic/common" />
-  <remove-project name="platform/vendor/harman/atom" />
-  ...
+  <remove-project name="platform/vendor/amlogic/ampere" />
+  <remove-project name="platform/vendor/amlogic/darwin" />
+  <remove-project name="platform/vendor/amlogic/franklin" />
+
 
-  <!--remove sabrina project first, then switch to p-tv-dev branch-->
-  <remove-project name="device/google/sabrina" />
-  <remove-project name="device/google/sabrina-kernel" />
-  <project path="device/google/sabrina" name="device/google/sabrina" remote="ohd" revision="refs/heads/p-tv-dev"/>
-  <project path="device/google/sabrina-kernel" name="device/google/sabrina-kernel" remote="ohd" revision="refs/heads/p-tv-dev"  />
-  ...
 
   <!-- common repositories shared by reference and atom/beast prjects -->
   <project path="device/amlogic/common" name="device/amlogic/common" remote="amlogic" revision="refs/heads/p-tv-dev"/>
@@ -110,22 +110,13 @@
   <!-- reference projects -->
   <project path="device/amlogic/ampere" name="device/amlogic/ampere" remote="amlogic" revision="refs/heads/p-tv-dev"/>
   <project clone-depth="2" path="device/amlogic/ampere-kernel" name="device/amlogic/ampere-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project path="device/amlogic/braun" name="device/amlogic/braun" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project clone-depth="2" path="device/amlogic/braun-kernel" name="device/amlogic/braun-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project path="device/amlogic/curie" name="device/amlogic/curie" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project clone-depth="2" path="device/amlogic/curie-kernel" name="device/amlogic/curie-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
   <project path="device/amlogic/darwin" name="device/amlogic/darwin" remote="amlogic" revision="refs/heads/p-tv-dev"/>
   <project clone-depth="2" path="device/amlogic/darwin-kernel" name="device/amlogic/darwin-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
 
   <project path="device/amlogic/franklin" name="device/amlogic/franklin" remote="amlogic" revision="refs/heads/p-tv-dev"/>
   <project clone-depth="2" path="device/amlogic/franklin-kernel" name="device/amlogic/franklin-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
   <project path="vendor/amlogic/franklin" name="platform/vendor/amlogic/franklin" remote="amlogic" revision="refs/heads/p-tv-dev" />
-
-  <project path="device/amlogic/fermi" name="device/amlogic/fermi" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project clone-depth="2" path="device/amlogic/fermi-kernel" name="device/amlogic/fermi-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-
-  <project path="device/amlogic/galilei" name="device/amlogic/galilei" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project clone-depth="2" path="device/amlogic/galilei-kernel" name="device/amlogic/galilei-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
+  <project path="vendor/amlogic/ampere" name="platform/vendor/amlogic/ampere" remote="amlogic" revision="refs/heads/p-tv-dev" />
   <project path="vendor/amlogic/darwin" name="platform/vendor/amlogic/darwin" remote="amlogic" revision="refs/heads/p-tv-dev" />
 
   ...
@@ -172,16 +163,9 @@
   <project path="hardware/wifi/qualcomm/drivers/qca9377" name="platform/hardware/wifi/qualcomm/drivers/qca9377" remote="amlogic" revision="refs/heads/p-tv-openlinux-nov"  />
 
   <project path="vendor/amlogic/common/gpu" name="platform/hardware/arm/gpu" remote="amlogic" revision="refs/heads/p-tv-openlinux-nov" />
-  <project path="vendor/amlogic/common/tdk" name="vendor/amlogic/tdk" remote="amlogic" revision="refs/heads/p-tv-openlinux-nov" />
   <project path="vendor/amlogic/common/tdk/linuxdriver" name="vendor/amlogic/tdk_linuxdriver" remote="amlogic" revision="refs/heads/p-tv-openlinux-nov" />
   <project path="vendor/amlogic/common/broadcom/btusb" name="vendor/broadcom/btusb" remote="amlogic" revision="refs/heads/p-tv-openlinux-nov" />
-  <project path="vendor/amlogic/common/prebuilt/libmediadrm/playready" name="vendor/playready" remote="amlogic" revision="refs/heads/p-tv-openlinux-nov" />
   ...
 
-  <!-- deadpool project -->
-  <project path="device/askey/deadpool" name="device/askey/deadpool" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project clone-depth="2" path="device/askey/deadpool-kernel" name="device/askey/deadpool-kernel" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  <project path="vendor/askey/deadpool" name="platform/vendor/askey/deadpool" remote="amlogic" revision="refs/heads/p-tv-dev"/>
-  ...
 
 </manifest>