diff options
author | Bill Yi <byi@google.com> | 2019-07-25 14:26:22 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 14:26:22 -0700 |
commit | 6c4b6f827697a573023b668b246862a215228ec9 (patch) | |
tree | 0898532177dd9fb108655a05af38d73a5ccab39e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1344415994d8b8c39cfd2af789e75f52d2f5f708 (diff) | |
parent | 8b5025f0f28789c2b0c38216b678e3ee745ff793 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: a1a6fe2bab -s ours
am: 8b5025f0f2 -s ours
am skip reason: subject contains skip directive
Change-Id: I53e148cde0f2097a8a40b7fef6e7195edf87727b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions