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

Browse Source

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d2c2520b03586c375601f8987c53d9e25d68c6b

...

This commit is contained in:

Adam Bookatz

2021-02-24 03:30:08 +00:00

committed by Automerger Merge Worker

parent 9aa1396e61 8d618ac1f7

commit 042f06aadf

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files