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