tree 44a1e431a009784dbc9141af25e7f224bd93b27d
parent b0ea011ffeeffe296ebb8fc75f5edd27e2023498
parent a57208271ca59064d6ad9f7606fdcf5e874b640e
author Kevin Chyn <kchyn@google.com> 1695357594 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695357594 +0000

[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0e6 am: a281783acc -s ours am: a57208271c -s ours

am skip reason: Merged-In I333dcc2c10346ce585d1c5e7f16cad113b2b5a95 with SHA-1 374bce76b4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756286

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