commit dd80dde8d22b5a4d4adba8f4692b8980eec91a7f
author Benoit Lamarche <benoitlamarche@google.com> Tue Dec 06 11:11:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 06 11:11:58 2016 +0000
tree 36eea1acb348bc85ab20d9374eb488a3996a5438
parent 54eac255b9fb5d87b15d65f2727b85db11bd21b9
parent 0e61b46673ac3e01492132060b1fab35a73e57d5

resolve merge conflicts of e04c941 to stage-aosp-master
am: 0e61b46673

Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 550fc70..c6456b1 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -64,7 +64,7 @@
   # 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)"