diff options
| author | Julien Desprez <jdesprez@google.com> | 2020-04-07 01:54:14 +0000 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2020-04-07 22:48:23 +0000 |
| commit | be34c2221edd3cfa9a3dd8c89cf2358736e4d9a0 (patch) | |
| tree | 480a83822817e0c0f2670ca04a40d19eacbca724 | |
| parent | 38000d8f60f420c2fee3cc62261aaa2101f9e0dc (diff) | |
| download | misc-be34c2221edd3cfa9a3dd8c89cf2358736e4d9a0.tar.gz | |
Merge "Update ddmlib after InstrumentationParser update" am: b378fddc58 am: 5b73465d02 am: 9565bd7843 am: fd3902a308 am: 27232bdd60
Bug: 153071808
Change-Id: I81751e9aae52f53a8979f4da1c61cc7d2cc652e7
(cherry picked from commit a9682118b85bf7d3846e9bf7ec6d9810640c3125)
Merged-In: I5aa5d0cae18738bd366fb729bac02fc23c9b2c00
| -rw-r--r-- | common/ddmlib/PREBUILT | 4 | ||||
| -rw-r--r-- | common/ddmlib/ddmlib-prebuilt.jar | bin | 449198 -> 454751 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT index e227d1a3..dded8460 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 284cf8e3340982a1b18389681f7ecd912208babf +From the commit df13b3d3b52e1599ce58feea4251bffeed93ee0f -Jar is obtained from git_studio-master-dev@6138453 +Jar is obtained from git_studio-master-dev@6369443 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 Binary files differindex 25cb5cfe..ab11f010 100644 --- a/common/ddmlib/ddmlib-prebuilt.jar +++ b/common/ddmlib/ddmlib-prebuilt.jar |