commit 8500b8837b7d6ed0086a7c644e2294c1fb225a73
author The Android Automerger <android-build@google.com> Thu Dec 17 16:35:13 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Dec 17 16:35:13 2015 -0800
tree 5580c0791681dc02edfae89fcb92eea1bfa442a5
parent 9492d270a6e03dfc95a53549738b9a0016d88eea
parent 98e29ea4cf1f5e954187323cbc40654f5112829e

merge in lmp-mr1-release history after reset to lmp-mr1-dev

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 2279028..2280c89 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=LMY49F
+export BUILD_ID=LMY49E

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 802c6a2..4b86e72 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -73,7 +73,7 @@
   # 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-01-01
+  PLATFORM_SECURITY_PATCH := 2016-02-01
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"