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