Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev

am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b
This commit is contained in:
Ian Pedowitz 2017-09-07 14:50:05 +00:00 committed by android-build-merger
commit 21873fbd4f
1 changed files with 2 additions and 2 deletions

View File

@ -78,7 +78,7 @@ PLATFORM_VERSION.OPM1 := 8.1.0
# 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 @@ else
# 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