diff options
| author | Bill Yi <byi@google.com> | 2016-08-17 17:14:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-17 17:14:15 +0000 |
| commit | c182b0067ea15969d6b4300c7afccf2d8d6d1205 (patch) | |
| tree | 0b6c2ee947988246bf70953bc9185ef40f8dc1d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5b0b9696bb0c848378aa981749ba832952447025 (diff) | |
| parent | 48d01fde6b22e614dc8bbd7ed9f1695387ad9868 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 48d01fde6b -s ours
Change-Id: Id88552a95441037ef5825a81311a95b9dd66ac73
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions