diff options
author | Bill Yi <byi@google.com> | 2019-06-24 19:58:02 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 19:58:02 -0700 |
commit | 639b7d001428d19b341901c46d7e586be9e21ee8 (patch) | |
tree | 05ac1884edb8d707f0a3a504bf82f23d0ff8c00b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f54fb9d900fef7e5efda9fb42eaecd3a29d03d96 (diff) | |
parent | d90e5e3d38467f000225c52b53dbfa673c7d9fcf (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: d90e5e3d38 -s ours
am skip reason: subject contains skip directive
Change-Id: I84861354ea6aa23c49245021d1f6ef69a29a540e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions