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