diff options
| author | Bill Yi <byi@google.com> | 2016-12-22 08:31:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 08:31:33 +0000 |
| commit | c745b488857529e7c2cd7c8a32c2e963a53cc96b (patch) | |
| tree | def59bafd36b99d0703d017dbd1fbda283e4ce4f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5d1bddc5d1c96a5cdb72f0f592f8872f7249f4a6 (diff) | |
| parent | 64a1060855f57bb6beb4bed56a3722b3bd484a5d (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 45c9ba9c15 -s ours
am: 64a1060855 -s ours
Change-Id: I49ae7611ab760f7c9632f31ceaf57234a06cbf73
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions