| commit | 750ed6a672149f90691dcf8d0e7ed46ea0dc85e6 | [log] [tgz] |
|---|---|---|
| author | Adam Bookatz <bookatz@google.com> | Wed Feb 24 04:30:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 24 04:30:23 2021 +0000 |
| tree | bfeb3ca094c35b35eff813807684a7b24fb4687a | |
| parent | aff1b740fb14b42ab2954042306e291904e9b7bd [diff] | |
| parent | 042f06aadfd65a73030b02db254fb10d8d72997e [diff] |
[automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 am: 042f06aadf -s ours 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: If7aa1b661119b6f224ffbd935a1b5a3d95a52a5c