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

resolve merge conflicts of e04c941 to stage-aosp-master

Browse Source 
am: 0e61b46673

Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb
This commit is contained in:
Benoit Lamarche
2016-12-06 11:11:58 +00:00
committed by android-build-merger
parent 54eac255b9 0e61b46673
commit dd80dde8d2
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

@@ -64,7 +64,7 @@ ifeq "" "$(PLATFORM_JACK_MIN_SDK_VERSION)"
# PLATFORM_SDK_VERSION. During development, this number may be incremented # PLATFORM_SDK_VERSION. During development, this number may be incremented
# before PLATFORM_SDK_VERSION if the plateform starts to add new java # before PLATFORM_SDK_VERSION if the plateform starts to add new java
# language supports. # language supports.
PLATFORM_JACK_MIN_SDK_VERSION := 25 PLATFORM_JACK_MIN_SDK_VERSION := o-b1
endif endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)" ifeq "" "$(PLATFORM_VERSION_CODENAME)"