diff options
author | Bill Yi <byi@google.com> | 2017-08-07 05:29:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-07 05:29:40 +0000 |
commit | 2c97d049c2d60c228c13ab43b8b741321a9ac321 (patch) | |
tree | 0d87955776e00fb5f4fcf430f92d038c3102e244 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | bbf4ba81acec632c4e8bd4ecbfe91c00175e3924 (diff) | |
parent | 06a47f450ab7fff2fa336d64ab6f58cf0c1b5955 (diff) |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 06a47f450a -s ours
Change-Id: I85fd4ac952d4958fa92b2bf0cda260ad5b5fbae1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions