summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdesprez <jdesprez@google.com>2017-08-02 15:09:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-02 15:09:56 +0000
commit80a47e9db26057d8d077f6f768b9db11a7e76870 (patch)
treeb06396509aced1b80225750b4354f3aaa37c2210
parent4eac4138a4067636b0b75c39b7e021c4eb9417e8 (diff)
parent2f2f81b6b55b7ac7aa80b2cd8f8c5cf347d37dc0 (diff)
downloadmisc-80a47e9db26057d8d077f6f768b9db11a7e76870.tar.gz
Update ddmlib with timeout fixesoreo-dr1-dev
am: 2f2f81b6b5 Change-Id: I3eac674d91bfac4bb49a6af42f7cf4cf35470ae6
-rw-r--r--common/ddmlib/PREBUILT4
-rw-r--r--common/ddmlib/ddmlib-prebuilt.jarbin328949 -> 326172 bytes
2 files changed, 2 insertions, 2 deletions
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index 174adda1..177d8ffc 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 cf16f4aee029eecc09c2519473b5c9560d6b21c2
-Jar is obtained from git_studio-master-dev@4058845
+Jar is obtained from git_studio-master-dev@4199093
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..21b33637 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ