aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Seaton <aseaton@google.com>2016-12-07 15:00:20 -0800
committerAdam Seaton <aseaton@google.com>2016-12-13 16:18:47 -0800
commit9f65420daf7c6d19a76e59b3d9e211abeef547bf (patch)
treeebb8d687f2d91f1edd66e99addf4ecabf6b8edb7
parent76387e57f6004ebd198f029e03851d903bba7158 (diff)
downloadbuild-9f65420daf7c6d19a76e59b3d9e211abeef547bf.tar.gz
Update Security String to 2017-02-01 on nyc-dev
fix merge conflict into security-a-release Change-Id: I0e2dd0afcb6dd490dd81afb879890eeb41bf121d
-rw-r--r--core/version_defaults.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e9770a83e7..3bda4868f2 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -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-01-01
+ PLATFORM_SECURITY_PATCH := 2017-02-01
endif
ifeq "" "$(PLATFORM_BASE_OS)"