commit f32b66a45d6d74a427bf4a159296b389a26c4d7f
author Brett Chabot <brettchabot@google.com> Mon Nov 26 14:59:40 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 26 14:59:40 2012 -0800
tree adfa8dcf5c4baa229f9a0d8beccce3c49853372a
parent cc86adcb3d78a64aed159facb1ad74d0e90310d3
parent e63e2c8458094286eae151b89770a4f946631726

am e63e2c84: Manually update tradefed prebuilt from jb.

* commit 'e63e2c8458094286eae151b89770a4f946631726':
  Manually update tradefed prebuilt from jb.

common/tradefed/PREBUILT

diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 2d983b5..d46d45f 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 4f5ecf14475a211b36a0813e5bed9a99db4d9056
+From the revision 6d5a7589392fd101fd58db8ed7b324790f3e

common/tradefed/tradefed-prebuilt.jar

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