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

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

Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev

am: e39fa5ef

Change-Id: I5918c7dfe27bb9b3c7aff031d79d961b08c3b711
parents 3eac3167 e39fa5ef
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,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-09-05
    PLATFORM_SECURITY_PATCH := 2017-10-05
endif

ifeq "" "$(PLATFORM_BASE_OS)"