diff options
| author | Bill Yi <byi@google.com> | 2016-08-02 03:12:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-02 03:12:34 +0000 |
| commit | d5bd38382429aaecb37c253b145411bdbd67ed26 (patch) | |
| tree | 24038d74e8451b8006b3f24a49ea878fe59c8c5e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0e2e179662115305328d0f5127cad037b28d53d4 (diff) | |
| parent | 424dacefecf57ba76c97aebc49682afa28bbe70b (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: fc9ad02469 -s ours am: 3f578ad25e -s ours
am: 424dacefec -s ours
Change-Id: I912a77158aa08b1685f34f0afb7a4c02f6ebcd0a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions