diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 08:00:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 08:00:22 -0800 |
| commit | 13b204f82b098e06c7f13a1c67bec702c63c1a28 (patch) | |
| tree | 858179056dcb0d807d989cc404b79109db91d542 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 584b1cc07324244e2b1c1f0013a8a67b4a87fa04 (diff) | |
| parent | 48557d6db32c9b489d8c3f165976bf7a92fee5c1 (diff) | |
am 48557d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '48557d6db32c9b489d8c3f165976bf7a92fee5c1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions