diff options
| author | Bill Yi <byi@google.com> | 2019-05-24 19:45:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-24 19:45:06 -0700 |
| commit | d4abcd0f46f9862871fc43d7a595101cd0102c73 (patch) | |
| tree | 383f80c9028b5d5f42ddb5ceaa950f8576b09fca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5bb097234659172b890a2cba6a96fd28a63ecb7a (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: Ib011f25791440ba6be99cd4e3f994c423604738b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions