diff options
| author | Baligh Uddin <baligh@google.com> | 2013-04-26 10:37:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 10:37:22 -0700 |
| commit | 3433b6ff3481d2364e8d727e70bb6fdbd3f139c0 (patch) | |
| tree | 59694bbe28d2fb169c328b8833f3b24a8dabce55 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aae1b5163c319eae31fca509f13ce0a4ea422840 (diff) | |
| parent | 5391a2fcb0d1232723ad37d6872bb5800414052f (diff) | |
am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '5391a2fcb0d1232723ad37d6872bb5800414052f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions