diff options
author | Bill Yi <byi@google.com> | 2019-09-25 16:05:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:05:05 -0700 |
commit | c75cf1f0c7131b797a7a8acabd07d53dc556d05d (patch) | |
tree | a8e0c84c716c0ebad45aaf6e51a28cf285457b49 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b2497c1d9c54e2634cbe653812239870a76ea9e0 (diff) | |
parent | 132a22ecece15ea69f8d7b0368d2ea35797388e6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 890bcfa7ac -s ours
am: 132a22ecec -s ours
am skip reason: subject contains skip directive
Change-Id: I8a91db4da2b410c9eb18e2b14f497b33d4538b17
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions