commit 02ec58d06bc3c2f44550f454e2e56932459870b7
author Brett Chabot <brettchabot@android.com> Wed Dec 07 11:35:59 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 07 11:35:59 2011 -0800
tree f9c384b1aa9904abe20dd3690bf9889fba4799fa
parent 21d6fd53641fb9ac35a95d534bfcbb657ccc7769
parent 42198eab28ca89718e8d420036ad26c21b442a61

Merge "Update tradefed prebuilt to fix emulator support." into ics-mr1

common/tradefed/PREBUILT

diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 366140d..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 bf5d5c9cf07367c2948b54df6feb3b8245c79619
+From the revision a64089126100851a2655edc46178ef9d72dbbb90

common/tradefed/tradefed-prebuilt.jar

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