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

Commit 8ad8d1bc authored by Xin Li's avatar Xin Li
Browse files

Merge QQ1A.191205.011 into stage-aosp-master 

Bug: 144955631
Merged-In: Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9
Change-Id: Id6deffc7ce714a7ddf7855293cd0fb629724fdeb
parents cde85ce1 e8d7dc64

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.



BUILD_ID=QQ1A.191003.001
 
BUILD_ID=QQ1A.191205.011

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,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 := 2019-11-05

      PLATFORM_SECURITY_PATCH := 2019-12-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH