diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-11 08:11:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 08:11:24 -0700 |
| commit | 9aa75f29a6259f8c65a5e1ad507f71ea3b419d47 (patch) | |
| tree | 8c32d2bfbfc0e40af820894b48b5e1fa06dc93f7 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c0cad45666372c7deafaa72ffbd50b86b6d6210b (diff) | |
| parent | ccfd6f44f487edb8cdd33731ec1f001bf9e1a913 (diff) | |
am ccfd6f44: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ccfd6f44f487edb8cdd33731ec1f001bf9e1a913':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions