Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926

am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213
This commit is contained in:
Adam Seaton 2017-04-12 23:07:46 +00:00 committed by android-build-merger
commit cf896d4bcb
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.
#
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2017-05-05
PLATFORM_SECURITY_PATCH := 2017-06-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"