diff options
| author | Bill Yi <byi@google.com> | 2019-05-09 12:00:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-09 12:00:49 -0700 |
| commit | 3564daaf613ea21c4d86dbd16a9cc3af40875502 (patch) | |
| tree | b524f33b26bb2fb4e6b5bc5cedd5ae7eaa4027db /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 02c6fcfc5fc69f7e422ded30f78760046ff46f23 (diff) | |
| parent | cfbbe54c97c09fe381eed721339797825a040731 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: cfbbe54c97 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d100382aa98e90a384a170224313b51a319fbcf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions