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

Commit 11c18464 authored by Adam Seaton's avatar Adam Seaton Committed by android-build-merger
Browse files

Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84 am: c1b0be15 am: e01e2788 

am: fe5a42c8

Change-Id: Ieb81d90a69d894b6ec4ce4bac5216a8ebce2f446
parents e5875ba6 fe5a42c8

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" 
    #  It must be of the form "YYYY-MM-DD" on production devices.

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