[automerger skipped] Merge "Add device-specific support for GoogleBattery AIDL V1" into tm-qpr-dev am: 2d8e5f2a53
am: 6322019fd9
-s ours
am skip reason: Merged-In I169436ab06f586079224c0ef3cf2ee8658978882 with SHA-1 cc9533f090
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/19327821
Change-Id: Id95c677becc84e471a46f12eec0f7418802d4ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
67a5a37309