tree 7c0327735b1e82d2845609829cb36514aea85826
parent babd5993e0a64d97489ad3948d7bd2ecad85652d
parent 100dd0281a0458fc3728cf99fd278eb683eb31b6
author Treehugger Robot <treehugger-gerrit@google.com> 1676073834 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1676073834 +0000

Merge "Disable flaking LocalesForegroundDialogTestCase test" into androidx-main am: 100dd0281a

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2430653

Change-Id: Ic868c7d681d3c1ecaa8a7becac34170413601126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>