Merge tag 'android-5.1.1_r6' into cm-12.1

Android 5.1.1 release 6
CyanogenMod · Jul 4, 2015 · bf3538c · bf3538c
2 parents 435b17f + 2e33977
commit bf3538c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/core/build_id.mk b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=LMY48B
+export BUILD_ID=LMY48G
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
@@ -30,9 +30,6 @@ PRODUCT_PROPERTY_OVERRIDES := \
 # Put en_US first in the list, so make it default.
 PRODUCT_LOCALES := en_US
 
-# Include drawables for all densities
-PRODUCT_AAPT_CONFIG := normal
-
 # Get some sounds
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)