diff options
author | Bill Yi <byi@google.com> | 2017-08-07 05:15:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-07 05:15:31 +0000 |
commit | e68c2dfce97c79f1064a95849daa514a203d0a51 (patch) | |
tree | 0d87955776e00fb5f4fcf430f92d038c3102e244 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0f61118df406e51639b919baf104b02f81d83bf8 (diff) | |
parent | ee4e5996812a85c6b21f74dae88911ce30d59548 (diff) |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ee4e599681 -s ours
Change-Id: I5b62f164478762bcd74ac9a051fb942fb70defaa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions