diff options
author | Bill Yi <byi@google.com> | 2017-08-16 15:32:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-16 15:32:54 +0000 |
commit | 5c3646aafddd6c7520d5a39517e03932694c4883 (patch) | |
tree | f9cf4ee471670acdbe5b7cdd4f19305359b16cf7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 983c33662107b51178391d3f82f67e2a14af0feb (diff) | |
parent | 6d995219d92c8f5c9b1649c4a84d828b9e620c34 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 6d995219d9 -s ours
Change-Id: I6651874c16cb6f50d00797211baa5c6772a5c7d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions