summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Rosenfeld <mrosenfeld@google.com>2017-07-20 08:41:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-20 08:41:54 +0000
commit1ef440bcb1412f2a54ecc43283f6af0d626a510a (patch)
tree32677b83e1eae29c79cc0d94f589e83170187dd1
parent36872dd95ad73cdbd97948e7eb1006bb7002c32f (diff)
parent4eac4138a4067636b0b75c39b7e021c4eb9417e8 (diff)
downloadmisc-1ef440bcb1412f2a54ecc43283f6af0d626a510a.tar.gz
Revert "Update ddmlib to get timeout command" am: 101cb219ae
am: 4eac4138a4 Change-Id: I2c9fcf2830f483693bb6320b774ecf90ba6365ed
-rw-r--r--common/ddmlib/PREBUILT4
-rw-r--r--common/ddmlib/ddmlib-prebuilt.jarbin325707 -> 328949 bytes
2 files changed, 2 insertions, 2 deletions
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index 4033bffc..174adda1 100644
--- a/common/ddmlib/PREBUILT
+++ b/common/ddmlib/PREBUILT
@@ -1,9 +1,9 @@
The object in this prebuilt directory can be built from
platform/tools/base
-From the commit 2ad592512e878d4b16f82af85ab0cdb09f683ade
+From the commit f764d774fbdf4fa7cf258b2e8c328a458a9aca53
-Jar is obtained from git_studio-master-dev@4152598
+Jar is obtained from git_studio-master-dev@4058845
Note: Before dropping the ddmlib-prebuilt.jar, please run
the following command to strip the jar manifest file,
diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index 2e4c8e01..42cde73a 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ