commit 21873fbd4f44b31b38526567ccba6e52ab2be3d8
author Ian Pedowitz <ijpedowitz@google.com> Thu Sep 07 14:50:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 07 14:50:05 2017 +0000
tree 891360bb50c69ab87d70f0b4d931250b8c6c10ea
parent d09059851cbbc329d9ac8386c119533eefc7455a
parent 418b2914864520d503d964e1dc0d7cbaa8b15193

Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d971faa..2c0cd55 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -78,7 +78,7 @@
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.OPM1 := OMR1
+PLATFORM_VERSION_CODENAME.OPM1 := REL
 
 ifndef PLATFORM_VERSION
   PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@@ -175,7 +175,7 @@
     # assuming the device can only support APIs as of the previous official
     # public release.
     # This value will always be 0 for release builds.
-    PLATFORM_PREVIEW_SDK_VERSION := 1
+    PLATFORM_PREVIEW_SDK_VERSION := 0
   endif
 endif