StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of f2304ce to nyc-mr1-dev

Browse Source 
am: 637c0192fc

* commit '637c0192fcede4e91b4040bf9c486dfe1fb93d74':
  NYC is now REL

Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262
This commit is contained in:
Ian Pedowitz
2016-06-03 19:50:41 +00:00
committed by android-build-merger
parent 672cda26d7 637c0192fc
commit 364e42edae
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/version_defaults.mk
View File

@@ -75,7 +75,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional
# codenames after PLATFORM_VERSION_CODENAME.
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N
endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"