Merge changes Id4d040ea,I318fb1fc into mnc-dev

am: a2603bd360

Change-Id: Ia22d1824913e82550dae44a799cb9da4c7344949
This commit is contained in:
Adam Seaton 2017-05-23 17:32:15 +00:00 committed by android-build-merger
commit f5c749c512

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)"