diff options
| author | Shayne CHEN <shaynechen@google.com> | 2020-11-06 02:59:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 02:59:03 +0000 |
| commit | d1ae7fcf07e09c8aba356b78ae19583683b9af54 (patch) | |
| tree | 7787273bda2f00498c01c8c89defc76a62034dbb | |
| parent | 2dd3103e6b6d2b4efd5005da27e0d2e3d0854bd7 (diff) | |
| parent | 4451d60cc3e7b1f06905ee07883a7f3630fc454f (diff) | |
| download | misc-d1ae7fcf07e09c8aba356b78ae19583683b9af54.tar.gz | |
Merge "Update ddmlib for handle Pixel_3 and Pixel_3_XL custom path in battery fetcher." am: b4453dab31 am: e8795eb104 am: 4451d60cc3
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1476516
Change-Id: Ib2a4303778511cc77b097c7f2367fcb29d277e17
| -rw-r--r-- | common/ddmlib/PREBUILT | 4 | ||||
| -rw-r--r-- | common/ddmlib/ddmlib-prebuilt.jar | bin | 478441 -> 484344 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT index 709b89ac..d1152c5e 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 I690dab1afa84d0cbaa594ec750136cf06ef0eccc +From the commit I7757e4e44f071f41ae891500ceda5810938075be -Jar is obtained from git_studio-master-dev@6569608 +Jar is obtained from git_studio-master-dev@6901859 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 fad1629b..942c3596 100644 --- a/common/ddmlib/ddmlib-prebuilt.jar +++ b/common/ddmlib/ddmlib-prebuilt.jar |