diff options
author | Bill Yi <byi@google.com> | 2019-08-22 18:02:12 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-22 18:02:12 -0700 |
commit | 7002e2a91269f713b45c31ee463f628e529b4ab2 (patch) | |
tree | 1fa1d790df01ad609d81de5a7465bebb9ef47e25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 83392f441dd0b2e5012276b85281af22fa1fc3c5 (diff) | |
parent | b7ad07adad60dba1ee2e467c741d586672976a4d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b7ad07adad -s ours
am skip reason: subject contains skip directive
Change-Id: I2bb88ed792c2b4525acd2377c59bb31379e55ed7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions