[automerger skipped] Merge 24Q4 into AOSP main am: e4061df686 -s ours

am skip reason: Merged-In I9293619aace80d52a3765f60f36bbddb8c3d8181 with SHA-1 d6823d1dce is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/contrib/+/3414237

Change-Id: Ic9ff5e25a3150975d63349b6e26d8affa1a9bb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 076c9bb77e81438b7694398b41704cab33e03181
  1. res/
  2. src/
  3. tests/
  4. .classpath
  5. .gitignore
  6. .project
  7. Android.bp
  8. OWNERS
  9. PREUPLOAD.cfg
  10. README
  11. README.txt