diff options
author | Bill Yi <byi@google.com> | 2017-06-17 06:07:03 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-17 06:07:03 +0000 |
commit | dee1ecf9df44cd741946532c0d434069218d8f30 (patch) | |
tree | a7d7fce661d3b14ba2662b237bcddb31ca4970aa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4116849cfbaa53491a95c2f6ceac857cccebdc1f (diff) | |
parent | f0bdfbc508768ca1f30eb39d1c85f7f2180f1f4a (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dev
am: f0bdfbc508 -s ours
Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions