tree 945f67f68f33437759bbd00e634784b32a4a9a52
parent afe64d7b5f434a54ae6e81ac00d060d8e86397d1
parent 6803425827818b78083ed018b1b4e46a4ece5e02
author Narayan Kamath <narayan@google.com> 1390901742 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1390901743 +0000

Merge "Allow cts-tradefed to be run with java7."