merge in mnc-mr1-release history after reset to mnc-dr-dev

diff --git a/core/build_id.mk b/core/build_id.mk
index 8376343..3d097a0 100644 (file)
--- 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=MMB29R
+export BUILD_ID=MMB29P

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index bf9b2e8..2939224 100644 (file)
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
   # Can be an arbitrary string, but must be a single word.
   #
   # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-  PLATFORM_SECURITY_PATCH := 2016-02-01
+  PLATFORM_SECURITY_PATCH := 2016-01-01
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"