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

Commit 3463d0e1 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE 

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
parents efc5d814 c1b33081

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" 
  # intermediate builds).  During development, this number remains at the

  # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds

  # the code-name of the new development work.

  PLATFORM_SDK_VERSION := 8

  PLATFORM_SDK_VERSION := 10

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"