diff options
| author | Bill Yi <byi@google.com> | 2019-06-30 18:11:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-30 18:11:08 -0700 |
| commit | 9e27e75c582afeda2524dd55edaf5b21ab5fcaad (patch) | |
| tree | 070d1fbf85b1652fdedb7ad8c516f4993e9c4f65 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e550e4704a2f6a2bc2bc5281a37a68be0d11265 (diff) | |
| parent | a7a1f96b09a338ded4984e6d85ea17b13413c29d (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e876855f59 -s ours
am: a7a1f96b09 -s ours
am skip reason: subject contains skip directive
Change-Id: I7bfcbfb1f9769c0beae7b41beb5ee6854f30df06
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions