diff options
| author | Bill Yi <byi@google.com> | 2016-07-01 05:09:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:09:30 +0000 |
| commit | 715da3530ac4deeca7152fdd285623b7e060596a (patch) | |
| tree | 51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d98dbbec171737957b1b4c6e06f074e64982552b (diff) | |
| parent | 7061535ce659f2eb96eb76043ad08dcf26ac9b73 (diff) | |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 7061535ce6 -s ours
Change-Id: I88f1354f45342c386bd988f6f9d6034760f1604d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions