Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE

Change-Id: I3a011850a108e0c66a10033e7df7ec45cd65320b
Merged-In: I474bf28ef86c76dd604fbece203c15a91e7ce92a
Merged-In: I61b7ab63d9bfa44259e3219903f551df5904505b
Merged-In: I4393eea75a53f90e23a53020b4a551228564e3cc
Merged-In: Ie843b46958b008073dc60d426e9dff4134db2430
Merged-In: Ief4b514032bfad1fad1a81c68b4f5e360569f105
This commit is contained in:
Bill Yi 2020-05-04 20:38:21 -07:00
commit e1fe634c3f

View file

@ -237,7 +237,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 := 2020-04-05
PLATFORM_SECURITY_PATCH := 2020-05-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH