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

Commit 0e61b466 authored by Benoit Lamarche's avatar Benoit Lamarche
Browse files

resolve merge conflicts of e04c9416 to stage-aosp-master 

Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
parents 0deb783a e04c9416

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ifeq "" "$(PLATFORM_JACK_MIN_SDK_VERSION)" 
  # PLATFORM_SDK_VERSION. During development, this number may be incremented

  # before PLATFORM_SDK_VERSION if the plateform starts to add new java

  # language supports.

  PLATFORM_JACK_MIN_SDK_VERSION := 25

  PLATFORM_JACK_MIN_SDK_VERSION := o-b1

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"