diff options
author | Bill Yi <byi@google.com> | 2016-12-08 18:35:42 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-08 18:35:42 +0000 |
commit | 997b9410bcb53263624de8262ce2bad0e2f83464 (patch) | |
tree | 66820b5afd1a44067a3cef45a71d3f76831df6fe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f69418c699e0b5f48f39730990bd20d484050080 (diff) | |
parent | 314938f9bd83532f747d7f73f7fb1fb055614e1d (diff) |
Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours" into nyc-mr2-dev-plus-aosp
am: 314938f9bd -s ours
Change-Id: If04db51de38abc16a4f6813cc79409c44ae7d8a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions