summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdesprez <jdesprez@google.com>2017-07-06 07:56:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-06 07:56:23 +0000
commitc28f16fd090e7739dee315ead4137f2142a44c24 (patch)
tree601176ef1410765481dee71aecea4eab8cdf00f8
parentfb728cad270f8a5ba5674ea9a32d33383469664b (diff)
parent5efe1f06f538867d5775825923de3a1f77a0e3d6 (diff)
downloadmisc-c28f16fd090e7739dee315ead4137f2142a44c24.tar.gz
Update ddmlib to get timeout command am: 66cc81b7b1
am: 5efe1f06f5 Change-Id: I176db9b1ecc756713adff16a2a0c5ae3a0acbe77
-rw-r--r--common/ddmlib/PREBUILT4
-rw-r--r--common/ddmlib/ddmlib-prebuilt.jarbin328949 -> 325707 bytes
2 files changed, 2 insertions, 2 deletions
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index 174adda1..4033bffc 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 f764d774fbdf4fa7cf258b2e8c328a458a9aca53
+From the commit 2ad592512e878d4b16f82af85ab0cdb09f683ade
-Jar is obtained from git_studio-master-dev@4058845
+Jar is obtained from git_studio-master-dev@4152598
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 42cde73a..2e4c8e01 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ