Merge changes from topic "am-4efc35de565d424bb9e72064ce761d2e"
* changes: [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am:9b871300cb
-s ours am:bd0739fb8b
-s ours am:1eced777a4
-s ours [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am:2b993f3c37
-s ours am:dc6117919e
-s ours am:c0169601d3
-s ours
This commit is contained in:
commit
b09a550fc3