tree 20c100e4f602719cb292e93a62824fc8848df973
parent c309ada683785e9f5db1bc7ea74f11982079710f
parent 450a5984943e8bbe37f6f90f8a87bdf9ba120505
author Adam Bookatz <bookatz@google.com> 1614134425 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614134425 +0000

Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida7f4763d4039cf8af53a37b7e5faf5d42dbae21