diff options
author | Bill Yi <byi@google.com> | 2019-06-01 09:48:13 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 09:48:13 -0700 |
commit | e21edccff09e8cd4b258965abc6d0f26ac53f4bd (patch) | |
tree | 54d28b564086426ac89adb5a24abe167ba7b1cc0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3e3fbadb6a27e1ba4342905e0c90b9a35cb37617 (diff) | |
parent | 23922410c3432686cd80dfb0d50ac80397495226 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ae7fd0f501 -s ours
am: 23922410c3 -s ours
am skip reason: subject contains skip directive
Change-Id: I8e19b5fcb7404d1159c50e06f3d4ed231adecab1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions