diff options
| author | Bill Yi <byi@google.com> | 2019-07-12 16:22:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-12 16:22:54 -0700 |
| commit | ebda693daa6ddfba35e8d187b6f12329e99dfd7f (patch) | |
| tree | 3d4c7d05b532a7d542fc21abfc02db825fb91f27 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 545a4c369e295ff458a4616ea434e822f39ced35 (diff) | |
| parent | b0eb9621324f71ef5b64f3c8f524e28cec56cd67 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b0eb962132 -s ours
am skip reason: subject contains skip directive
Change-Id: I658c3f3345eead84d37f7922fdc66ce55750101e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions