| commit | 17e07081521249bf4b6edec8ebd70e93ef0477d7 | [log] [tgz] |
|---|---|---|
| author | Adam Bookatz <bookatz@google.com> | Sat Feb 20 00:21:36 2021 +0000 |
| committer | Adam Bookatz <bookatz@google.com> | Sat Feb 20 00:23:45 2021 +0000 |
| tree | d4adface20ddfc353269684a43264f03e99c4f0a | |
| parent | c2c5de6199d39a74a547a07e844ffa9e0cbc0f31 [diff] |
fuelgauge OWNERS eof newline merge conflict The AOSP version and internal version differ by an end-of-file newline, which is creating merge conflicts. Change-Id: Ib90a3ffbae9b44c3e6cf2287149f35318cd320a5 Test: N/A Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
diff --git a/src/com/android/settings/fuelgauge/OWNERS b/src/com/android/settings/fuelgauge/OWNERS index 237d353..ab3da89 100644 --- a/src/com/android/settings/fuelgauge/OWNERS +++ b/src/com/android/settings/fuelgauge/OWNERS
@@ -1,4 +1,4 @@ # Default reviewers for this and subdirectories. tifn@google.com wesleycwwang@google.com -ykhung@google.com \ No newline at end of file +ykhung@google.com