Merge changes I5c252cba,I80259eef into mnc-dev

am: ea6878b926

Change-Id: I1fa56eef94ac1a5108303bc93b3a32ac48ec9e94
This commit is contained in:
Adam Seaton 2017-04-12 23:03:15 +00:00 committed by android-build-merger
commit 2596931e86
1 changed files with 1 additions and 1 deletions

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. # 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-05-05 PLATFORM_SECURITY_PATCH := 2017-06-05
endif endif
ifeq "" "$(PLATFORM_BASE_OS)" ifeq "" "$(PLATFORM_BASE_OS)"