diff options
| author | Al Sutton <alsutton@google.com> | 2019-06-07 09:31:14 +0100 |
|---|---|---|
| committer | Al Sutton <alsutton@google.com> | 2019-06-07 09:40:24 +0100 |
| commit | d10e8f29a2a452beb9b1300f9f4c69cd248e1486 (patch) | |
| tree | 11bb279b3fd7707c7910308beb1c333c8ef8cd3d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e6c5f2245ad4b26c4dcbb7dbcef733decb3f4d86 (diff) | |
Reconcile the backup OWNERS files with the internal repo.
This CL addresses a specific branch where a merge conflict is happening.
Change-Id: I03d72ecec447304866d96e2f0908acbc2a1796b6
Merged-In: I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e
Test: build/make/tools/checkowners.py -c -v OWNERS
Bug: 134730213
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions