commit | aeb05239dec71d2fba396b0e30976a3bd375370d | [log] [tgz] |
---|---|---|
author | Tom Hsu <tomhsu@google.com> | Mon Oct 14 04:47:32 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 14 04:47:32 2024 +0000 |
tree | 787b9304744ed09749cba7d3f1fa266e9244004d | |
parent | 0a663440515895fd084047ba926495469efbd441 [diff] | |
parent | 60d85b93634592dec429eabf26c3515314e1fc4b [diff] |
[automerger skipped] Merge "Avoid test flaky" into main am: ec571901be am: 60d85b9363 -s ours am skip reason: Merged-In Id1290e6979fdafa93ded6f50e49d6b3464a80b50 with SHA-1 1955144ffc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3304564 Change-Id: I1e2920836d72e795ccacab1d08db5e11100e7080 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>