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

Commit 9fc3cf7b authored by Zach Jang's avatar Zach Jang Committed by android-build-merger
Browse files

resolve merge conflicts of 12db2242 to lmp-mr1-dev am: 0c672afc am: cf51c6cb 

am: cbf1e2cc

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
parents bf5d08ec cbf1e2cc

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,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)"