commit | 62cbc78e318cb18ff07b02fca0e847de3addf041 | [log] [tgz] |
---|---|---|
author | Brett Chabot <brettchabot@google.com> | Mon Dec 10 09:10:32 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 09:10:32 2012 -0800 |
tree | adfa8dcf5c4baa229f9a0d8beccce3c49853372a | |
parent | f32b66a45d6d74a427bf4a159296b389a26c4d7f [diff] | |
parent | 24624bb713e148aac43b3a8853d518efadcec1fa [diff] |
am 24624bb7: am 76872c9a: (-s ours) DO NOT MERGE: Manually update tradefed prebuilt from jb. * commit '24624bb713e148aac43b3a8853d518efadcec1fa': DO NOT MERGE: Manually update tradefed prebuilt from jb.