commit 2c1270d75b7a1c479ea9bc7812485830c31a4e34
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Apr 17 18:33:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 17 18:33:28 2018 +0000
tree 5ae0a3818b2624ada9a272a2e54014671e4ca714
parent 972e597665ae3c46ee7b8917c1f410f540ae6678
parent 61774937a252a88e7c33e52aa06f692df0354af1

Merge "Make change and version bump to OMC1.180417.001" into oreo-mr1-cts-release

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 59db984..0383ee1 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=OMC1.180320.001
+export BUILD_ID=OMC1.180417.001

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f03d9ba..ba494ff 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -181,7 +181,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 := 2018-03-05
+      PLATFORM_SECURITY_PATCH := 2018-04-05
 endif
 
 ifndef PLATFORM_BASE_OS