commit b6ba3084e6cc24e01f1ef2802e0dc8a81ef69ba9
author Elliott Hughes <enh@google.com> Tue Nov 27 18:45:16 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 27 18:45:16 2012 -0800
tree f5f158caa46550c9144606d3c5d90bd7b6868528
parent 88f036925e3850c16c2bec29722dafca39d30430
parent 9edb6a948514ba3a2b39dec4e1817799b60a9db3

am 9edb6a94: Merge "ICU 49.2 upgrade"

* commit '9edb6a948514ba3a2b39dec4e1817799b60a9db3':
  ICU 49.2 upgrade

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