resolve merge conflicts of e04c941 to stage-aosp-master

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
commit dd80dde8d2

View file

@ -64,7 +64,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)"