diff options
author | Bill Yi <byi@google.com> | 2019-07-18 14:52:46 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 14:52:46 -0700 |
commit | 7fb9af4242523ded3c294f5551e432fd67a8b0f2 (patch) | |
tree | 2f3b5bf0bb8eeb5fc7e75b53eb29f486be20c5b3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 41c6f6c957c814b77ce435c2fd16b0e000a58ab2 (diff) | |
parent | 465f347c2a1fde95442127efc22609b952af7ee2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 465f347c2a -s ours
am skip reason: subject contains skip directive
Change-Id: I2f537649cf9c1d9ca9182491dc9f10a82ae88781
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions