diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-22 12:32:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 12:32:52 +0000 |
| commit | 6e936043cf8db9bfbf2699ac43bcd71daaf019ba (patch) | |
| tree | 14ce77591432911b53f5f6a93ac2ff0eceb31be9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2a65006968ef937b275c56a9d1fe78ef0517c8ec (diff) | |
| parent | 7fca59894256fc85ca1ac2bf40da25cc9f8ff020 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1328f9015a -s ours am: d5e671d32a -s ours am: ce0549992e -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions