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