diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-25 22:07:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 22:07:59 +0000 |
| commit | 5480b3746af1efcd94b2d05c477324de7878b1e9 (patch) | |
| tree | 13a85ed3fb707002090a3a523d1d6d69bbd50cea /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5a292604eb2b85e6418918e131b50e73d76c5e6a (diff) | |
| parent | 00e4b6c50af5d6cb38d0e0dd21e14624d65e109d (diff) | |
am 00e4b6c5: (-s ours) am b48db445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '00e4b6c50af5d6cb38d0e0dd21e14624d65e109d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions