diff options
| author | Bill Yi <byi@google.com> | 2019-08-09 10:09:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-09 10:09:41 -0700 |
| commit | 85048a601030fabf7081d4c2c4d09b72dbd0a50d (patch) | |
| tree | 5e6bd74cddddbd2687987e5c744e6ca6c2b97410 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dd33e843e8538232239eaebe4bd91e80f6cb9558 (diff) | |
| parent | c7a7eaa776e4112278b965a26aede37fa9847bd8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: c7a7eaa776 -s ours
am skip reason: subject contains skip directive
Change-Id: I32ea99183287e07c8c41d3f6e720deddca22a367
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions