tree f8145fc0b35c7d61a5440a3084b2cf64406835ad
parent 4d27573feb4ae9f398c16e5de96fab21867b55c2
parent 96a1abd202b9b44abf8759a68b0ca881ee090d53
author Treehugger Robot <treehugger-gerrit@google.com> 1674913572 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674913572 +0000

[automerger skipped] Merge "Add a method to note waking network packets to BatteryStats" am: b3238fc8a4 am: caebc65963 am: 96a1abd202 -s ours

am skip reason: Merged-In I1a29fc7cbe74990e317f0d62d3894523387bdde1 with SHA-1 53b10b22d1 is already in history

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

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