Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512

am: def58d6dec

Change-Id: I766d7eb612200e0ae9f6ae3eabf9bab92c152cb1
This commit is contained in:
Adam Seaton
2017-05-23 17:36:16 +00:00
committed by android-build-merger

View File

@@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# 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 := 2017-06-05
PLATFORM_SECURITY_PATCH := 2017-07-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"