diff options
author | Bill Yi <byi@google.com> | 2019-05-25 13:12:02 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-25 13:12:02 -0700 |
commit | f3e05f1a0147b74da7803a2a5f5d91bfbee6ba05 (patch) | |
tree | 872496487dbb990ad960eb065493d8e30a886c68 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d0dcd678ff12ffa48c9de885017882493fbd4db9 (diff) | |
parent | 2d33bb61ca7b04d74e60add51d7eed2955d33fab (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 2d33bb61ca -s ours
am skip reason: subject contains skip directive
Change-Id: I66fbcbbd087a52dac4ed081958fefbf0bc7dd21d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions