| commit | 23f6d74f426eddb16abf1e0408dd1b20e0eb8b90 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@google.com> | Mon Dec 10 09:15:25 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 09:15:25 2012 -0800 |
| tree | 0ed89bfc717a9bc701c0845d8cc8a463c537ad59 | |
| parent | 31eac578f941c8af509e938726370628f897187e [diff] | |
| parent | a2197ebdf03d87c4fa7e554ac12dec7e629060bb [diff] |
am a2197ebd: (-s ours) am 62cbc78e: am 24624bb7: am 76872c9a: (-s ours) DO NOT MERGE: Manually update tradefed prebuilt from jb. * commit 'a2197ebdf03d87c4fa7e554ac12dec7e629060bb': DO NOT MERGE: Manually update tradefed prebuilt from jb.