[automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0
-s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22216487
Change-Id: I7b1b917a258cb1410009ef709491355b71420ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
3741225b05