diff options
author | Bill Yi <byi@google.com> | 2019-09-25 16:24:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:24:45 -0700 |
commit | 6ad9a215fa776a4fad688a01f7926966be0dd481 (patch) | |
tree | c8e287e790ee4fae08838d85841efc27321250f7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c3dd708c8c490dd7100c0deba69db0b9f33c4eb1 (diff) | |
parent | 94a3f227ab6adfe34cd1a189dad1c76a231ef0d0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cd1ef6fddd -s ours am: 27f72a29c7 -s ours
am: 94a3f227ab -s ours
am skip reason: subject contains skip directive
Change-Id: I3b92ba68c233a8d3eab3dfe0344849c55d35172d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions