Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0 Conflicts: core/Makefile core/base_rules.mk core/build_id.mk core/cleanbuild.mk core/combo/TARGET_linux-arm.mk core/combo/arch/arm/armv7-a-neon.mk core/definitions.mk core/dex_preopt.mk core/host_java_library.mk core/java.mk core/tasks/product-graph.mk core/version_defaults.mk envsetup.sh target/board/generic/BoardConfig.mk target/product/core.mk target/product/generic_no_telephony.mk target/product/languages_full.mk target/product/sdk.mk tools/releasetools/edify_generator.py tools/releasetools/ota_from_target_files
Loading
Please register or sign in to comment