diff options
| author | Bill Yi <byi@google.com> | 2019-06-24 19:52:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 19:52:31 -0700 |
| commit | f54fb9d900fef7e5efda9fb42eaecd3a29d03d96 (patch) | |
| tree | 05ac1884edb8d707f0a3a504bf82f23d0ff8c00b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 67c21d4341a5a1d9592da8161bac633da73f7b5f (diff) | |
| parent | a1f6fbd41c572fff2f3ec2ce46fdf100a878348c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: a1f6fbd41c -s ours
am skip reason: subject contains skip directive
Change-Id: I4eff119da425ecfc9f2170489435e453cfe4411c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions