diff options
author | Bill Yi <byi@google.com> | 2019-07-30 11:57:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-30 11:57:57 -0700 |
commit | 90f37252e0f5e6623f09421f8101fa7bc41ac8e3 (patch) | |
tree | 43f54d8049a2ede94e0017d632ada745b86950fe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 181237a2467ea79ef65aa91eff558e0342f9dc6a (diff) | |
parent | 7acde27742f52aebe16bbaf0a1f30a2a7facb7aa (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours
am: 7acde27742 -s ours
am skip reason: subject contains skip directive
Change-Id: I04179dd0166078da567392943545888398babe72
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions