commit | efd21c52add291bb92dafa3a8c695eb4f2bfff60 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 26 22:00:20 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 26 22:00:20 2023 +0000 |
tree | 9cc949e4a6b5b3b68aa7dda76b832a7c26b9e68a | |
parent | aff87112445d55d6c7d0a265ed0942636eec3aae [diff] | |
parent | c347b6f4c0b86f86187a3bd15e546cf4aaf7411f [diff] |
[automerger skipped] Merge "Merge android14-tests-dev" into main am: 56313636ca -s ours am: f2712caa3b -s ours am: c347b6f4c0 -s ours am skip reason: Merged-In I2e2e18a9ec0d1a2fd505464a1297e9b7f9874d1c with SHA-1 026a007fe4 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781856 Change-Id: I4cdeac811b94a4adc6199015338a07c8868f032a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>