diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-11 14:45:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-11 14:45:05 -0800 |
| commit | dcb83484644fe212345b6f5f1689480fa4a624b8 (patch) | |
| tree | 4ee45334961ab4c79820d37768d0018a091e2564 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 45ad4f4e6391dfe5c56d9bb6e1d11cc1f1bbdb0e (diff) | |
| parent | 6164b1666b571905dd313e542ceb9adcaf6e6803 (diff) | |
am 6164b166: (-s ours) am 840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '6164b1666b571905dd313e542ceb9adcaf6e6803':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions