| commit | c76860ffac1484ff29dc8966e8a7751ba5c20700 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Wed Aug 03 12:13:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 03 12:13:07 2016 +0000 |
| tree | ef67ed42b50bc82e49005ee6b4c26b4818c4db8f | |
| parent | 2ef7e26ebe5cf88c996e2bc29ccd50b835c4c0f5 [diff] | |
| parent | e34cba15c1a724086b09b5641091384776c4d7ba [diff] |
Merge changes from topic 'upgrade-mockito-1.10.19-dexmaker-1.3' am: e34cba15c1 Change-Id: I83144638c2fe3faabccf41972a9b42da12478458
diff --git a/Android.mk b/Android.mk index aa5bf11..d9bf34c 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)