merge in nyc-mr2-security-b-release history after reset to nyc-mr2-release
diff --git a/core/build_id.mk b/core/build_id.mk
index 51909ab..3fc513c 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=NKG47J
+export BUILD_ID=N2G47O
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 83ac470..a93dc31 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -131,7 +131,7 @@
# 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-04-05
+ PLATFORM_SECURITY_PATCH := 2017-05-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"
