diff options
author | Bill Yi <byi@google.com> | 2019-05-22 06:12:07 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 06:12:07 -0700 |
commit | 4b3ed3febc7a0f83d7206f0a37c1df9a0236839e (patch) | |
tree | 4a024e130d28f706419306843186a20bc8bd3d54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ede613bd82756cd415150a0affaa24bd507660b8 (diff) | |
parent | c26fe293105ce97f1532d4cc11079761b4140454 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6fe655eb70 -s ours am: 5d5aae9536 -s ours
am: c26fe29310 -s ours
am skip reason: subject contains skip directive
Change-Id: Id4df33671df980b9882c2b5bf9412b87ef14e5e7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions