| commit | 21722bdc457b129f0d4f12fdbbc59ad576e09ff4 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu Feb 25 00:00:51 2016 -0800 |
| committer | The Android Automerger <android-build@google.com> | Thu Feb 25 00:00:51 2016 -0800 |
| tree | 8cfb910a18fd59c1682ea7582395139675426de9 | |
| parent | d339ff4de952c9a064b445ea2359c4d851a4770e [diff] | |
| parent | 2b2785579bc87f726c7aa97fae713853a8b37f6d [diff] |
merge in nyc-release history after reset to nyc-dev
diff --git a/Android.mk b/Android.mk index 4ddaa58..21ff612 100644 --- a/Android.mk +++ b/Android.mk
@@ -29,6 +29,7 @@ LOCAL_JAVA_LIBRARIES := junit objenesis-host ant LOCAL_MODULE := mockito-host LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY)