commit 31eac578f941c8af509e938726370628f897187e
author Brett Chabot <brettchabot@google.com> Mon Nov 26 14:20:50 2012 -0800
committer Keun young Park <keunyoung@google.com> Mon Dec 03 11:07:56 2012 -0800
tree 0ed89bfc717a9bc701c0845d8cc8a463c537ad59
parent d206e5cf0cf9b3b04398a5541b58ba8e8f853ab8

Manually update tradefed prebuilt from jb.

JB change is  Ie24751f7f3dc02701abdbe38ee42d18d3133aff2

Automerge didn't work due to change in prebuilt location.

Change-Id: I54a0784a2c1e8d790be2dafe910d36e266450b5d

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