diff options
author | Bill Yi <byi@google.com> | 2019-05-22 01:25:59 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 01:25:59 -0700 |
commit | e5c7029b4cb63bbd8e890b03dfbd6d22fc3a9eaa (patch) | |
tree | d5080547dc601f59284f816af7117e09c719d9a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a22e0ba1a9c460ae0b6498061455773a6be91eb7 (diff) | |
parent | 033d7caf95572021c931078a5564c0dd894cbc96 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 033d7caf95 -s ours
am skip reason: subject contains skip directive
Change-Id: I960e5550b18d08903167759d9893a9744a5e4c77
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions