diff options
| author | Bill Yi <byi@google.com> | 2019-05-24 20:15:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-24 20:15:19 -0700 |
| commit | 7f8ad43801f18b1def7ac36982ac818ac5f9bf4e (patch) | |
| tree | fecf92f22e7eff6f7fd5ccf7157cefe7754cd32f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8502711899953dd9cd32399c7c9dcfdae0205ba8 (diff) | |
| parent | 8f1b7c7702a5e2ccb0818e0a664958bcc0b68850 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 8f1b7c7702 -s ours
am skip reason: subject contains skip directive
Change-Id: Id67bd02dca4b395d43dc967c76187f26baebc785
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions