commit 1e1589ad21f1751a9e868680903e192dda71d5a1
author The Android Automerger <android-build@android.com> Tue Jul 24 20:23:18 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Jul 24 20:23:18 2012 -0700
tree 41f7bafe334f221deac5cb0c9ebde1d1964eb4dd
parent f787b1d0a777b32770ac1f6bcf3e83d5e31f8b64
parent e7aee28e3fd854ebee3304a1274f3f32da72e71f

merge in jb-release history after reset to jb-dev

common/tradefed/PREBUILT

diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 2d983b5..58d7bf6 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 a64089126100851a2655edc46178ef9d72dbbb90

common/tradefed/tradefed-prebuilt.jar

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