| commit | 348a282c11b89eca47a63f115562b5cecfdd8b97 | [log] [tgz] |
|---|---|---|
| author | Al Sutton <alsutton@google.com> | Fri Jun 07 09:50:19 2019 +0100 |
| committer | Al Sutton <alsutton@google.com> | Fri Jun 07 09:50:19 2019 +0100 |
| tree | 1b6804537dbd280e0385f76fd91c9ade2172be27 | |
| parent | 73d49e3d1bbdd6d0de72850f473fcbd78b12a780 [diff] |
Reconcile the backup OWNERS files with the internal repo. This CL addresses a specific branch where a merge conflict is happening. Change-Id: I69f6419055be4adc974041d78a1517ded7e5c57b Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e Test: build/make/tools/checkowners.py -c -v OWNERS Bug: 134730213