diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 14:06:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-05 14:06:52 -0700 |
| commit | 9b38ec8ccd8ab032b33194b6160b490041c8e42a (patch) | |
| tree | ac9fe1319268bd430114b85f2e2d3abf5590bcfa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 96a88f3a22b8a16c3427a97b773e5f5e5ed87c64 (diff) | |
| parent | 03f35832bfffe5ea9d1e4f479bd619c9904d1591 (diff) | |
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours
am: 03f35832bf -s ours
am skip reason: subject contains skip directive
Change-Id: I112f6ad00252d63046d6732a5c0fa72e7ff64e9c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions