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

Commit 644d84d8 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r24' into cm-14.1 

Android 7.1.2 release 24

# gpg: Signature made Fri 30 Jun 2017 01:19:21 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 762ca4d9 2dd5b56d

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=NJH47B
 
export BUILD_ID=NJH47D

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