diff options
| author | Bill Yi <byi@google.com> | 2016-11-02 13:03:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-02 13:03:03 +0000 |
| commit | 015687b0269d0a45ae205359ba71357e35fdb714 (patch) | |
| tree | 4af9392a2f18e03ad7e205fa319ecea576aaaee7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e2dac2cd85fda5f2935bebd902b3eec1b8491ba7 (diff) | |
| parent | f750173bf14e7d2dc631831f2cf9dacb12b6bf14 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: f750173bf1 -s ours
Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions