Merge "[automerger skipped] gs201: update AIDL IGoogleBattery manifest version to 2 am: 88992a6bb7
-s ours am: 3d6da31422
-s ours am: d833df9f67
-s ours"
This commit is contained in:
commit
4f603f8e65