commit | a57208271ca59064d6ad9f7606fdcf5e874b640e | [log] [tgz] |
---|---|---|
author | Kevin Chyn <kchyn@google.com> | Fri Sep 22 03:45:52 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 03:45:52 2023 +0000 |
tree | d329056426955884bf1e258382856f5eb933613b | |
parent | 039b58a8e220c224bacde0733fea6c7ef0a31011 [diff] | |
parent | a281783acc5e11a82f406e8d2a1e3fc7116f9e2c [diff] |
[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0e6 am: a281783acc -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: I2144253237c54ede8f479d743a167e5d2b89515e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>