diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-25 19:02:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 19:02:05 +0000 |
| commit | 0a4bd7c90c836a8d3d857753c72d83b35cefa5f3 (patch) | |
| tree | 9fd824aa97918e7c30f4ac4c6e0b4a852456ed02 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b (diff) | |
| parent | f318306232c2cb3095eecd72d1fa06059bf35f8e (diff) | |
am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'f318306232c2cb3095eecd72d1fa06059bf35f8e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions