commit e16258ff5d98f84c9888de9b6120f71cf3d5d588
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 03 23:15:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 03 23:15:06 2019 +0000
tree b1a2adb5458bb41ddec4b35942b70fa56cf07315
parent c4fbb3a42debf6ab01b2b1e1d924aab53afff9dd
parent 3fc4383f38d570e1ea1ee808246771cae8f13a5a

Merge "Merge Android10 QPR1 into AOSP master"

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 03a8cd3..cefc4b2 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=QD1A.190821.011
+BUILD_ID=QQ1A.191205.011

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ff5fb42..8095212 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,7 @@
     #  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-10-05
+      PLATFORM_SECURITY_PATCH := 2019-12-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH