tree 15e41414e98402a452a214fc504b7c477d4334b6
parent b81e6070180bb1c34743a13022c2dc4ba2e73634
parent a4280dc4b0299492f5de04af79230d4ad18206c7
author Dmitri Plotnikov <dplotnikov@google.com> 1701126901 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701126901 +0000

[automerger skipped] Merge "Avoid including com.android.server.power.stats in presubmit twice" into main am: 23e53c1c7e am: a4280dc4b0 -s ours

am skip reason: Merged-In Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2 with SHA-1 1814dffd1c is already in history

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

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