diff options
author | Bill Yi <byi@google.com> | 2019-08-05 19:07:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 19:07:48 -0700 |
commit | 1f24aac7da643930bae803ede26ae65c27397e96 (patch) | |
tree | 4b4d1c3923a116fd1967f905bb956cf1af0d311a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b6125edbb28608397f80a332ad727c8ae44feefe (diff) | |
parent | 3ca8c70e381896ce9c33dff4db0b387362d52df4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 3ca8c70e38 -s ours
am skip reason: subject contains skip directive
Change-Id: I4295c873aebd86f331447788b991a00ea16d019b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions