Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e4c25e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev 

* commit 'b7157909':
  Obviously JB MR1.1 should be Android 4.2.2.
parents 7bfd28d7 b7157909

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" 
  # which is the version that we reveal to the end user.

  # Update this value when the platform version changes (rather

  # than overriding it somewhere else).  Can be an arbitrary string.

  PLATFORM_VERSION := 4.2.1

  PLATFORM_VERSION := 4.2.2

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"