commit f7d233bc9dffeef10b7d052ac3deff6bc1bcbc24
author android-build-team Robot <android-build-team-robot@google.com> Mon Jun 11 22:32:37 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jun 11 22:33:00 2018 +0000
tree a594d6dfcbc67d06d1a9436556a968452c16e56e
parent 2d990ff2f772184e8e47c0a398f874f342e7d561
parent 643535ec28a43a64b4b4d73dc2c8ed4d5284582e

Make change and version bump to OPM4.171019.021.R1

Change-Id: Ifa647575875d55c4da371b1f28e8709d38c5467f

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index f4c6477..84f0d91 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=OPM4.171019.021
+export BUILD_ID=OPM4.171019.021.R1

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a15537e..e23b9af 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-05-05
+      PLATFORM_SECURITY_PATCH := 2018-07-05
 endif
 
 ifndef PLATFORM_BASE_OS