diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-22 03:11:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 03:11:08 +0000 |
| commit | 25fe41b8e0a0e7e80bcc533b5087d63767faa689 (patch) | |
| tree | bde4db766b585687234e96d027c8b0274b57a841 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a83b42cb402cb5856e7490f5190c982a9f0575d8 (diff) | |
| parent | 74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca (diff) | |
am 74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions