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