Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Allow overriding bluetooth.properties for emulators
Revert "Remove c2 from manifests"
Remove c2 from manifests
Revert "Add android.hardware.usb.host.xml to makefile."
Change-Id: I2b97b4b1a498a8c3352555c0ae3b9dec0acfa96b
diff --git a/car/AndroidProducts.mk b/car/AndroidProducts.mk
index 803a4c1..03ffd00 100644
--- a/car/AndroidProducts.mk
+++ b/car/AndroidProducts.mk
@@ -21,11 +21,4 @@
$(LOCAL_DIR)/sdk_car_x86.mk \
$(LOCAL_DIR)/sdk_car_x86_64.mk \
-COMMON_LUNCH_CHOICES := \
- sdk_car_arm-userdebug \
- sdk_car_arm64-userdebug \
- sdk_car_portrait_x86_64-userdebug \
- sdk_car_x86-userdebug \
- sdk_car_x86_64-userdebug \
-
EMULATOR_VENDOR_NO_SOUND_TRIGGER := false
diff --git a/pc/AndroidProducts.mk b/pc/AndroidProducts.mk
index 1f6a90e..5e45227 100644
--- a/pc/AndroidProducts.mk
+++ b/pc/AndroidProducts.mk
@@ -16,6 +16,3 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/sdk_pc_x86_64.mk \
-
-COMMON_LUNCH_CHOICES := \
- sdk_pc_x86_64-userdebug \