| commit | 042f06aadfd65a73030b02db254fb10d8d72997e | [log] [tgz] |
|---|---|---|
| author | Adam Bookatz <bookatz@google.com> | Wed Feb 24 03:30:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 24 03:30:08 2021 +0000 |
| tree | 070f5811b872ab5988428145aa1ea66bbba3e673 | |
| parent | 9aa1396e6126e73a360547572034ed7489ae4667 [diff] | |
| parent | 8d618ac1f766ef75d9ec0eeb6aefaad4f86e767b [diff] |
Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d2c2520b03586c375601f8987c53d9e25d68c6b