diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /build/conf/classVersions.txt | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'build/conf/classVersions.txt')
| -rw-r--r-- | build/conf/classVersions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/conf/classVersions.txt b/build/conf/classVersions.txt index dd39ad0006d3..7835116e0be0 100644 --- a/build/conf/classVersions.txt +++ b/build/conf/classVersions.txt @@ -36,4 +36,6 @@ 1.5 => plugins/Groovy/lib/groovy_rt.jar 1.5 => lib/annotations.jar +1.5 => plugins/gradle/lib/gradle-jps-plugin.jar + 1.3 => plugins/junit/lib/junit-rt.jar
\ No newline at end of file |