Merge "Revert "Add adb keys to debuggable AOSP builds"" am: 40fae9ca0f

am: 438a8b800a

Change-Id: I32ff3e53910b0d162a4aa40ae0111589f979a053
This commit is contained in:
Dan Willemsen 2017-11-02 17:24:48 +00:00 committed by android-build-merger
commit be48f9de21

View file

@ -53,6 +53,3 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk)
# Get everything else from the parent package # Get everything else from the parent package
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
# Add adb keys to debuggable AOSP builds (if they exist)
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)