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 am: 0e61b46673

Browse Source 
am: dd80dde8d2

Change-Id: Iff9f1ef1653a7a878dee9fb23dc7398e2b3805fc
This commit is contained in:
Benoit Lamarche
2016-12-06 11:16:05 +00:00
committed by android-build-merger
parent ca9eca2477 dd80dde8d2
commit 0de297d254
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

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