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

Commit e7bc1542 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:... 

resolve merge conflicts of 12db2242 to lmp-mr1-dev am: 0c672afc am: cf51c6cb am: cbf1e2cc am: 9fc3cf7b
am: 3749025c

Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
parents 5d77e7e0 3749025c

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)"