diff options
author | Bill Yi <byi@google.com> | 2017-08-24 07:58:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-24 07:58:50 +0000 |
commit | 714c11a3ab492266f5f2c9cf0f6467e655bfd20a (patch) | |
tree | fcbc0cba54a9f2ae24e6f8bf595083ab47419a8f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 04c8a76c9622e6a6ac3cc5a4446ab60877daf083 (diff) | |
parent | 0309d32f3e168f5f9893dceadaefae9300c4264b (diff) |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 0309d32f3e -s ours
Change-Id: I3982df3278279f1debb6b2e578393edbc37b356a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions