diff options
author | Al Sutton <alsutton@google.com> | 2019-04-30 00:46:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-30 00:46:27 -0700 |
commit | 15483ee38cd9c8f41d30a178d15e2ce5393852b0 (patch) | |
tree | 3ea774eb1d25b19a9dc6bbcda7b0be9c582ed970 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | aa5ec0985d14517a66efc0139b6a0454d56e145e (diff) | |
parent | f8e199f033539546dba1b4d02a6747503cac1c19 (diff) |
[automerger skipped] Merge "Update team members in the OWNERS file. DO NOT MERGE"
am: f8e199f033 -s ours
am skip reason: subject contains skip directive
Change-Id: I260270ea1d5e8a41fc4e8ec8baa749bbb53b97d6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions