diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-16 15:34:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-16 15:34:04 +0000 |
| commit | 755343447204575a8efb68769a3e6738987d225d (patch) | |
| tree | 8cbebacd6ee8aed806d1699e65970b9691dbfad8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3471e8034975a12cdcdd1b6264ceb6d721031a7e (diff) | |
| parent | e65c292a5e7f4d70a43f965909647f89bb46809d (diff) | |
am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'e65c292a5e7f4d70a43f965909647f89bb46809d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions