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

Commit 0c672afc authored by Zach Jang's avatar Zach Jang
Browse files

resolve merge conflicts of 12db2242 to lmp-mr1-dev 

Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
parents ab6c0894 12db2242

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" 
  # Can be an arbitrary string, but must be a single word.

  #

  # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

  PLATFORM_SECURITY_PATCH := 2016-07-05

  PLATFORM_SECURITY_PATCH := 2016-08-05

endif



ifeq "" "$(PLATFORM_BASE_OS)"