diff options
| author | Baligh Uddin <baligh@google.com> | 2014-01-07 00:37:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 00:37:46 +0000 |
| commit | 24c2980cb2a9a93d1d6fe2a849f915b3819056c2 (patch) | |
| tree | 80f51c86a4836bcc78a76dd9e65fa364c87374d8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fce889710225bfefd99af59afb83085b23a79704 (diff) | |
| parent | be24e41b41e9ccec3bb685baf9dc951b386116ee (diff) | |
am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'be24e41b41e9ccec3bb685baf9dc951b386116ee':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions