diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 14:23:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 14:23:18 -0800 |
| commit | 3a8fe6ff825ed6b565e0172fbd7b7a5097554497 (patch) | |
| tree | e6d1d2d4af2209734e5c4dda9b118978e5166798 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5b8c652cef8d05d25748486e6bc3cd1982baabac (diff) | |
| parent | 0ada814a36a86e87af1b03de8482620684c4b17c (diff) | |
am 0ada814a: (-s ours) am 63c0e12b: (-s ours) am 41c3cb38: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '0ada814a36a86e87af1b03de8482620684c4b17c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions