| commit | 9ff81e6b3a7f09ea06188f980bae594ce2dda79f | [log] [tgz] |
|---|---|---|
| author | SongFerng Wang <songferngwang@google.com> | Wed Jul 03 10:08:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 03 10:08:42 2024 +0000 |
| tree | b1247e7b1a317f9266dd52f42fc901c44e2b7572 | |
| parent | 69b1c7c99a44cc9141d47b9a889db70c4e129a1f [diff] | |
| parent | 7423e21ba33351f9f99204235a94030e791d5b5a [diff] |
[automerger skipped] Merge "Fix AppBatteryPreferenceTest flaky" into main am: 5462789fae -s ours am: 7423e21ba3 -s ours am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3077806 Change-Id: Ied279905ec1a6595f12660660cdca09c1bf3b2a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>