Merge changes I7c8a25a2,Ifb32d061 into oc-dev

am: 683c44c812

Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
This commit is contained in:
Adam Seaton 2017-07-20 20:57:46 +00:00 committed by android-build-merger
commit c7d9294cd9

View file

@ -186,7 +186,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # 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. # 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. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2017-08-05 PLATFORM_SECURITY_PATCH := 2017-09-05
endif endif
ifndef PLATFORM_BASE_OS ifndef PLATFORM_BASE_OS