diff options
author | Bill Yi <byi@google.com> | 2019-07-31 15:19:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 15:19:57 -0700 |
commit | 0377ba85f439f86098bc2d14313fe8cdf82aba67 (patch) | |
tree | ee58279259af495f6b59f3adce33e8429d152565 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8fbdd96523a7776c6df5c6c86f6944d8f8655ab4 (diff) | |
parent | 23ae47a8d75e7b12100851505abe8d9f1b555bf6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: de521e7d3d -s ours
am: 23ae47a8d7 -s ours
am skip reason: subject contains skip directive
Change-Id: I3e80d4cb852de02961536f61551ed08399db1686
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions