diff options
author | Bill Yi <byi@google.com> | 2019-05-26 11:27:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-26 11:27:19 -0700 |
commit | 1b9e21de45312773d6ff4f5dcee6f60d7ee95272 (patch) | |
tree | a7a2849009e6415be5131dba1c685e621c435326 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ecfd87ad13e508e7b59bee9ebbd96bae4eabfa6c (diff) | |
parent | 992c70c5e21f31c639af98ea5ae1eb139cdaff79 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 992c70c5e2 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bb7c48bb8ad3f90441251e4b5b85b4346c64813
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions