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

Commit e60040d2 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents cbedda67 ec8ec1cc
Loading
Loading
Loading
Loading
+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 := 2020-12-05
    PLATFORM_SECURITY_PATCH := 2021-01-05
endif

ifeq "" "$(PLATFORM_BASE_OS)"