diff options
author | Bill Yi <byi@google.com> | 2019-07-19 14:41:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-19 14:41:19 -0700 |
commit | d79ff1bcce2ce70c2d4d1dda4f5ec9c052c9b996 (patch) | |
tree | 6617b71e55dd1926aa0a04a59ba9fb53e8f72dcc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 320d4af7d9f65d93c4a0736d06ff13ddfaff53a7 (diff) | |
parent | 08b38f6300eed5e7381830d3de89c2decf9bd518 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7dc20157fb -s ours
am: 08b38f6300 -s ours
am skip reason: subject contains skip directive
Change-Id: I53d545680327971026895ed59ea6a7a8305c628f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions