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

Commit a2603bd3 authored by Adam Seaton's avatar Adam Seaton Committed by Android (Google) Code Review
Browse files

Merge changes Id4d040ea,I318fb1fc into mnc-dev 

* changes:
  [DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev bug:38342695
  [DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev bug:38342695
parents 025c26de 7eb60e96

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" 
  #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

  #

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

  PLATFORM_SECURITY_PATCH := 2017-06-05

  PLATFORM_SECURITY_PATCH := 2017-07-05

endif



ifeq "" "$(PLATFORM_BASE_OS)"