diff options
author | Bill Yi <byi@google.com> | 2017-08-05 02:45:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-05 02:45:25 +0000 |
commit | 9989fe58d30ae808a778770910f22e6a184f952b (patch) | |
tree | 2f0066b895ef36fe536cb0bc5282821e8b736e7f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4fe58637b34260b9e580d80a20458e5bfb71bc28 (diff) | |
parent | bce71a114d7bf58d4cc7307da80275d4ebe3887e (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: bce71a114d -s ours
Change-Id: Ic1e95e19874989fc5fc52f6600cd4370ade4cafb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions