diff options
author | Bill Yi <byi@google.com> | 2019-06-24 08:03:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 08:03:45 -0700 |
commit | 067f9816b1fe6285b6448c617cbce8f495d97046 (patch) | |
tree | fec512f53c3ee99531e521a2d33aa0ea36f8b40b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a9cd5d94f3e16bc370cda69a10266f30b8ef11cc (diff) | |
parent | e0c262b7dad2df476e3521c39ddda87b60650412 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: e0c262b7da -s ours
am skip reason: subject contains skip directive
Change-Id: I606d9432a1c72d57c7656acea1421ec2c9676f77
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions