Merge "ICU 49.2 upgrade"
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
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