commit | 38b8dba0910471beae8aafb24b8ee60cbea88fc1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 17 19:55:09 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 17 19:55:09 2024 +0000 |
tree | 9147e32ed6a8be5b6cf2da1dadb7fb9a7f36c7cc | |
parent | de7f22609cd85f17c3d4fcfa029fbfbc96923fbb [diff] | |
parent | 0664ad8c89732d221bacc84b4d3bf596fb880aba [diff] |
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 0664ad8c89 -s ours am skip reason: Merged-In I0743edca5f0b34aadb7eb58bfa3deca27d6b1159 with SHA-1 de7f22609c is already in history Original change: https://android-review.googlesource.com/c/platform/test/catbox/+/3132481 Change-Id: I2e90a1d531070ab4c2076ce6982d3a3ec300a8c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>