diff options
| author | Geoff Mendal <mendal@google.com> | 2015-10-21 18:16:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 18:16:22 +0000 |
| commit | 0192d592dc88b8992cad390c50bfc13e52627d8c (patch) | |
| tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2fbefc0636bcac00f47e163b4b200351b9e48a36 (diff) | |
| parent | 7dd2ea1f4ee9f2df25b3705ff5273076a948b6a1 (diff) | |
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a73a642bfe -s ours am: ea6ea27ba6 -s ours
am: 7dd2ea1f4e -s ours
* commit '7dd2ea1f4ee9f2df25b3705ff5273076a948b6a1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions