diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:06:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:06:21 +0000 |
| commit | bf2226ec7f9fcb0a2fc169df170c770363d9a3f5 (patch) | |
| tree | 693a938d06c7cc9157dab1d9bc88ca7dc243905d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 699991c8a296834e8fe843bce85529b018d12af8 (diff) | |
| parent | 8b297fb6ef42650a1126287aa0b610aa9a503167 (diff) | |
am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8b297fb6ef42650a1126287aa0b610aa9a503167':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions