diff options
author | Bill Yi <byi@google.com> | 2019-11-09 16:15:15 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-09 16:15:15 -0800 |
commit | a7df76d3c9d42b9422cdbfd3b200088ef52b0ac3 (patch) | |
tree | 5034a5921cfa33b9312722e06eae302e21d0cf8f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9d86289f3b6eaf519bd336d79e69a56efcdc44fe (diff) | |
parent | 311594b69db010c4c5458be85f1992fae0dd081d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 311594b69d -s ours
am skip reason: subject contains skip directive
Change-Id: I9c26510b0c925d3f260afa21914770bb7ba74187
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions