diff options
author | Bill Yi <byi@google.com> | 2017-08-01 07:41:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 07:41:01 +0000 |
commit | fb80235f4113a05cb918884dc95a2118c4d10978 (patch) | |
tree | d6c1778ef1d7cd42f1a93de10c5f43392c652bbb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | dd730a17966cb404af8a110868b457d1c0f92d16 (diff) | |
parent | 7eca0300b9c1b6cb8962dd66a71343f091daa298 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7eca0300b9 -s ours
Change-Id: I0a52d4ad04ee589d80dd34f218eba693097aa979
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions