diff options
| author | Bill Yi <byi@google.com> | 2016-11-01 08:12:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-01 08:12:37 +0000 |
| commit | 9ec830d8a43922dd030b25a56599be4d908c7398 (patch) | |
| tree | 45e1c63a6c6b31dcb13a52ca23b6cccb161301a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fe0c8f6e63c2361446d83fa919fa331f4c6856c1 (diff) | |
| parent | 7aceace7ca75b9f2d5bf3f1cf148d7056de82661 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e82b728101 -s ours am: c0ff60f272 -s ours am: cf8be6d4e0 -s ours
am: 7aceace7ca -s ours
Change-Id: I0bb26ca195b00dc0fcd9c5d7ffc5496405772051
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions