| commit | ef38c683335278be956979cda4b5fa851e12d45a | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Mon Nov 27 23:49:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 27 23:49:54 2023 +0000 |
| tree | 0831ac06e41d7f4e0054b5ded7659746dbce7856 | |
| parent | 3b4c13c8bc230537cb50b04eb0cd3d6d18d210be [diff] | |
| parent | b81e6070180bb1c34743a13022c2dc4ba2e73634 [diff] |
[automerger skipped] Merge "Avoid including com.android.server.power.stats in presubmit twice" into main am: 23e53c1c7e -s ours am: c9bd342c7e -s ours am: b81e607018 -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: I03de8486d2ad9f640a8150f6219e5885e15cf5b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>