Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into nyc-dr1-dev

* changes:
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
  [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847
This commit is contained in:
TreeHugger Robot
2018-02-13 22:48:46 +00:00
committed by Android (Google) Code Review

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 := 2018-03-01
PLATFORM_SECURITY_PATCH := 2018-04-01
endif
ifeq "" "$(PLATFORM_BASE_OS)"