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