diff options
author | Bill Yi <byi@google.com> | 2019-05-11 21:40:50 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-11 21:40:50 -0700 |
commit | eb212ac008df1c9148b70776cc876ff2e539ba9f (patch) | |
tree | 22214a7d8d83ed621f6d7fa0c133c7c78f8cbfb7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ed75b868850090b46926019d0e16231ea98a35b6 (diff) | |
parent | 6c70f2693a1e6beb4b9a86e87498593c84946a03 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6c70f2693a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie18363997e5bef1c4edb8d633208dd132f69be53
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions