diff options
author | Bill Yi <byi@google.com> | 2019-06-19 07:51:56 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 07:51:56 -0700 |
commit | e5cffc8ba63b959b467ae63a1c710a8463deffbc (patch) | |
tree | a4da1900db898db86dfbe52fb1ebfaaa1e51d0e0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d2098f84d0d679af895f441a4283af93bed7d3fe (diff) | |
parent | 577a5aa1497baac23f96e73a6008bfdf5a1efa5f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 577a5aa149 -s ours
am skip reason: subject contains skip directive
Change-Id: I24a508194017c106eb8e6e6411ad4f9952c307a4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions