diff options
author | Bill Yi <byi@google.com> | 2019-07-15 06:45:58 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-15 06:45:58 -0700 |
commit | 8e3a599e28d5b6b1d8d77f76eb5f9a7b18cee753 (patch) | |
tree | 7c56399a7af8ed1e0a0823548805aae693689383 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d32cc0a359c0dc25ec2f26b77bf42622c489bf4c (diff) | |
parent | bd19b3999ada2fa5ba4212987a6a1327962b59eb (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: d5e7e0753c -s ours
am: bd19b3999a -s ours
am skip reason: subject contains skip directive
Change-Id: I33e98d2228421ed8f42e427b65da4b1027878e3a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions