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

Unverified Commit c3d7caf0 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-7.1.1_r9' of https://android.googlesource.com/platform/build into cm-14.1 

Android 7.1.1 release 9
parents b24d6786 13047629

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=NMF26Q
 
export BUILD_ID=NMF26V

core/version_defaults.mk

+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 := 2016-12-05

      PLATFORM_SECURITY_PATCH := 2017-01-05

endif



ifeq "" "$(PLATFORM_BASE_OS)"