tree 9466fb59b43a96d8a5140a410f1f524f8108ac92
parent 8aaa7f0911fbc25eb02ec006b8094cd0a627ecee
parent 72a396489424f1b5607e9c32aed3ed1990ed7ed3
author Darren Hsu <darrenhsu@google.com> 1670895178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670895178 +0000

Merge "powerstats: add new EnergyConsumerType for camera" am: 72a3964894

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2335183

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