| commit | 4f2c27d6958eefcde3c0f01d30ca42d6e8eef6ca | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Fri Sep 22 06:28:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 06:28:19 2023 +0000 |
| tree | bbcffd32523db8c96fd33c7e6120c1357a5dac20 | |
| parent | 6a853abcf3bed9189341816d30439b1706fa6f17 [diff] | |
| parent | 1de863a4d902994fa5188aa79ec2e47fc2e44a48 [diff] |
[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0e6 am: a281783acc -s ours am: a57208271c -s ours am: a59d46ec8c -s ours am: 1de863a4d9 -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: Ifa105b1f774d84b5e630032c0cd87ac89d647642 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>