Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 750ed6a6 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am:... 

[automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a5984 am: 8d618ac1 am: 042f06aa -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7aa1b661119b6f224ffbd935a1b5a3d95a52a5c
parents aff1b740 042f06aa
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment