Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4

am: e01e278881

Change-Id: I551a205e346cc21af3befafb7a0194693ed83c94
This commit is contained in:
Adam Seaton 2017-05-23 17:40:44 +00:00 committed by android-build-merger
commit fe5a42c88d

View file

@ -114,7 +114,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# 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.
# 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)"