diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-27 08:21:43 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-27 08:21:43 -0800 |
| commit | edbde7094e1ad671be89a177dea259cfb6c0cdd5 (patch) | |
| tree | adfa8dcf5c4baa229f9a0d8beccce3c49853372a | |
| parent | d9b11c3a7bdffa02bf7e2bd84f291c9c7418c884 (diff) | |
| parent | e63e2c8458094286eae151b89770a4f946631726 (diff) | |
| download | misc-edbde7094e1ad671be89a177dea259cfb6c0cdd5.tar.gz | |
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: I30d8a859ae8573bd3892bf1f7e400b4b1bb3476e
| -rw-r--r-- | common/tradefed/PREBUILT | 2 | ||||
| -rw-r--r-- | common/tradefed/tradefed-prebuilt.jar | bin | 2425483 -> 2434924 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT index 2d983b5f..d46d45fe 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 Binary files differindex 9803c81a..86a8d20e 100644 --- a/common/tradefed/tradefed-prebuilt.jar +++ b/common/tradefed/tradefed-prebuilt.jar |