diff options
author | Bill Yi <byi@google.com> | 2019-05-25 14:10:15 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-25 14:10:15 -0700 |
commit | 192798c87e6883ced00da498d2508717e0516f2f (patch) | |
tree | 872496487dbb990ad960eb065493d8e30a886c68 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5ff60b6a85c4d097a89e87fb451feca5a119b708 (diff) | |
parent | 85dcca9b694c7128530016edbaa420b9978cb0d6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 85dcca9b69 -s ours
am skip reason: subject contains skip directive
Change-Id: I3040596533f4c77add7679af95aca24fba04cd17
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions