OSDN Git Service

Merge "Make javac always use Java 7 when running tests using javac and dx"
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 20 Sep 2016 16:56:14 +0000 (16:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 16:56:14 +0000 (16:56 +0000)
am: 901669c8ff

Change-Id: I4f9f4f6503b7fb53347560d48f7261cfea597f6e


Trivial merge