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

Commit e015c18f authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-8.1.0_r11' into HEAD 

Android 8.1.0 release 11

# gpg: Signature made Tue Jan 30 15:41:03 2018 CST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78
parents 0d6595f6 e5924a51

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=OPM1.171019.013
 
export BUILD_ID=OPM1.171019.018

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ ifndef 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 := 2018-01-05

      PLATFORM_SECURITY_PATCH := 2018-02-05

endif



ifndef PLATFORM_BASE_OS