commit 7f5de013859ccdb83993a6a9bb39195dc2d2f7dd
author android-build-team Robot <android-build-team-robot@google.com> Mon Jun 04 21:56:48 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jun 04 21:57:20 2018 +0000
tree d74b5c17f223d77ef39fb717b85760eae4b59df8
parent c2e092d749c57da30ce324ca22480ee135db4c00
parent ff3a0c447461ed9dcaf65df59ee51fe3f0cb9528

Make change and version bump to OPM2.171026.006.G1

Change-Id: I7103b452372ba3742b487c8c548a8388a612d82e

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 18d3454..3c98d50 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=OPM2.171026.006
+export BUILD_ID=OPM2.171026.006.G1

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