diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:05:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:05:15 +0000 |
| commit | 1c568804d4764ff1b48baf7e50edce69b7ac6726 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7ef5df0ba45067cb0db32e710e4f541502486546 (diff) | |
| parent | e30eb8b3bac31c09b9a68e74b40f497a8e1c570f (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: e30eb8b3ba -s ours
* commit 'e30eb8b3bac31c09b9a68e74b40f497a8e1c570f':
Import translations. DO NOT MERGE
Change-Id: I9c3b3fe14de85880737f58a67b649b90685121aa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions