diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-08 14:43:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 14:43:50 +0000 |
| commit | 33c08e2986832fa32fc08350f946e7c2e8f2b3a6 (patch) | |
| tree | e5b9b9a51a3b9e06b02bae72641f06d76760f4eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | db55bb0622e9fbe4b858d59409f516de01c1f1fd (diff) | |
| parent | 825bfb4f7e9b87bf49a76d9fb43623da1df0df19 (diff) | |
am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '825bfb4f7e9b87bf49a76d9fb43623da1df0df19':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions