diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-23 00:52:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-23 00:52:54 +0000 |
commit | c4e24a354bf6cf298648acc7dcccd5a9f3fa6b9b (patch) | |
tree | e4f9c922938e4f894cc432ebdaf3e3bf23069980 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 66aa0d8afec080da5d534e8a3852ddbd026036cd (diff) | |
parent | 3b362e981a739a8b9279e9835b322592983962c8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9b7ef73172 -s ours am: 3b362e981a -s ours
am skip reason: subject contains skip directive
Change-Id: I9e8a99b47f148668c21f2270d968839b2df4dce9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions