| commit | 5a64f9c289c1af345f0d05e07b9ba161eedb7342 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jan 28 09:40:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 28 09:40:50 2014 +0000 |
| tree | 7ea5d25fba6f48495b9588fcbe1b09ba7c7e6a02 | |
| parent | 4f0ae8533816d3df820f89653782ef71910e8cb0 [diff] | |
| parent | 5ef7bff64da60327f08552c7919bb64f649144fc [diff] |
am 5ef7bff6: Merge "Allow cts-tradefed to be run with java7." * commit '5ef7bff64da60327f08552c7919bb64f649144fc': Allow cts-tradefed to be run with java7.