[automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 am: 042f06aadf -s ours am: 750ed6a672 -s ours

Browse Source

am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id872a83b40c52e1e5c302b0f11b9a4758b27ca56

...

This commit is contained in:

Adam Bookatz

2021-02-24 05:07:39 +00:00

committed by Automerger Merge Worker

parent 69fcca2971 750ed6a672

commit 456e50f1a9

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

Diff Content Not Available