Cody Kesting 6f8a8f06c4 Merge "Allow system components to request underlying network policies." am: ba04ef8481 am: 89a75849c2 am: 46309401db ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ff2d79f5d35888cd4bae6742eb40035603c5eeb

2021-01-29 23:39:23 +00:00

..

android

Update BatteryExternalStatsWorker to use the new EnergyConsumerType

2021-01-26 01:11:37 +00:00

com/android/server

Merge "Allow system components to request underlying network policies." am: ba04ef8481 am: 89a75849c2 am: 46309401db

2021-01-29 23:39:23 +00:00