diff options
author | Bill Yi <byi@google.com> | 2019-09-25 15:45:26 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 15:45:26 -0700 |
commit | 74b8c53db9f830f0c83305712a5e303ebe4b2069 (patch) | |
tree | 6ad63b7e9cc3d2cf1e14feb4fb1f154f13c74524 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e6568741374225f938717f0a6bdcf533a146d28a (diff) | |
parent | 4411ca05406ce9faf70507e57a41f0f0c9068b3b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f82c8527ab -s ours
am: 4411ca0540 -s ours
am skip reason: subject contains skip directive
Change-Id: I4cb68d51b0dd9dffff66cd851a0d2f48eb1b304d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions