commit 88f036925e3850c16c2bec29722dafca39d30430
author Brett Chabot <brettchabot@google.com> Tue Nov 27 11:33:51 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 27 11:33:51 2012 -0800
tree 53cfab5dd8ce23d9bb07c28c674360466c217908
parent d7c097e46451641f99a21638786c5939ca82c557
parent f32b66a45d6d74a427bf4a159296b389a26c4d7f

am f32b66a4: am e63e2c84: Manually update tradefed prebuilt from jb.

* commit 'f32b66a45d6d74a427bf4a159296b389a26c4d7f':

common/tradefed/PREBUILT

diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index d46d45f..2d983b5 100644
--- a/common/tradefed/PREBUILT
+++ b/common/tradefed/PREBUILT
@@ -1,4 +1,4 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/tools/tradefederation
 
-From the revision 6d5a7589392fd101fd58db8ed7b324790f3e
+From the revision 4f5ecf14475a211b36a0813e5bed9a99db4d9056

common/tradefed/tradefed-prebuilt.jar

diff --git a/common/tradefed/tradefed-prebuilt.jar b/common/tradefed/tradefed-prebuilt.jar
index 86a8d20..9803c81 100644
--- a/common/tradefed/tradefed-prebuilt.jar
+++ b/common/tradefed/tradefed-prebuilt.jar
Binary files differ