resolve merge conflicts of 47ba91cd62
to qt-qpr1-dev
Update Security String to 2020-10-01 Bug: 163542576 Change-Id: Ib3ea041e914229da60487137b385933f31238089 Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f
This commit is contained in:
commit
952f59cccd
1 changed files with 1 additions and 1 deletions
|
@ -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 := 2020-09-01
|
||||
PLATFORM_SECURITY_PATCH := 2020-10-01
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_SECURITY_PATCH
|
||||
|
||||
|
|
Loading…
Reference in a new issue