diff options
| author | Nick Kralevich <nnk@google.com> | 2019-04-05 14:36:18 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2019-04-05 14:36:18 -0700 |
| commit | 874f23e2b9370a06aa07f41c9cdd2d66d151c0c0 (patch) | |
| tree | 5303cbe717ce9fdd66aeb51ccbf677ba2425e63c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d89aa8e275214a18f7aad5191d12d8ba7f76a9ff (diff) | |
| parent | 07fc302bfbd9b0b192b8d7f43197632643f94b74 (diff) | |
resolve merge conflicts of 07fc302bfbd9b0b192b8d7f43197632643f94b74 to qt-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I01d0704abc8cf15969f1102d36eb2384b208b7a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions