commit bf2fd1a04b099397074031b00d2043a3c5c743ef
author The Android Automerger <android-build@google.com> Sat Aug 15 01:13:06 2015 -0700
committer The Android Automerger <android-build@google.com> Sat Aug 15 01:13:06 2015 -0700
tree ca90d4c34647c557ca3af6152be1c51df6cc8683
parent 1c6a95ca1b1f9b2bf03565289bdc9a237376acaa
parent 335cb5024487cb147dcba0f7739682a928b3aa0b

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

common/tradefed/PREBUILT

diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 838e7f8..a480e63 100644
--- a/common/tradefed/PREBUILT
+++ b/common/tradefed/PREBUILT
@@ -1,4 +1,6 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/tools/tradefederation
 
-From the revision 4db630154310a859d6e01aa0141efa17c918c1a8
+From the revision 4bc0ff65c5b58fa300ab244d5092504972bcc782
+
+prebuilt jar is obtained from tradefed@2168423

common/tradefed/tradefed-prebuilt.jar

diff --git a/common/tradefed/tradefed-prebuilt.jar b/common/tradefed/tradefed-prebuilt.jar
index e5568a1..8deae85 100644
--- a/common/tradefed/tradefed-prebuilt.jar
+++ b/common/tradefed/tradefed-prebuilt.jar
Binary files differ