diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:03:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:03:38 +0000 |
| commit | 1af20cc5764a38d0713a292fd63bf6a628f2f5eb (patch) | |
| tree | 2bfa2c18b11c19595086ee509e59012739aa4c09 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef (diff) | |
| parent | 554b43a066b6a084dbb9b7dba014de4b12ba1175 (diff) | |
am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '554b43a066b6a084dbb9b7dba014de4b12ba1175':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions