| commit | f61aece7f318a9bd572b8446b8028b8ee133cae7 | [log] [tgz] |
|---|---|---|
| author | Julien Desprez <jdesprez@google.com> | Thu Jun 03 16:03:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 03 16:03:07 2021 +0000 |
| tree | 29b98989ff60c79ed2365ca7dd2ead06252d6285 | |
| parent | 3c5cd0d05190e37502a2d11d92d868d077af08a8 [diff] | |
| parent | f72e0acd9861fdf543e8ac51c594370f44b40590 [diff] |
[automerger skipped] Ensure we use the tradefed repackaged from the tree am: f72e0acd98 -s ours am skip reason: Merged-In I35209968190984f4ecf93450179ae3a7c8c9b5c1 with SHA-1 639be750c4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/tradefederation/prebuilts/+/14803846 Change-Id: I48c0c4193f85180c3d89a11765cf4b0684e007de