diff options
author | Bill Yi <byi@google.com> | 2019-06-21 15:21:23 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-21 15:21:23 -0700 |
commit | 772a340689f04b102c5b1ba9b69f832d7b192b87 (patch) | |
tree | 5db3008601445341a4a1f365ab4668cb64cadda6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 43369ea648927d73b11bdc846bab0c0081ece551 (diff) | |
parent | 019e1bf3fb7fb61a5793535dbdb2863810fe4686 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive
Change-Id: I20dde9516b31187e21f5eb90f7dce45019d1f96e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions