diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-23 19:36:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-23 19:36:15 -0700 |
| commit | 8a79a1cba6b7d287e5e4b886060370dd11ff0b45 (patch) | |
| tree | 51b080ab8440a10d1d40eb0f7933b14a523cfbd7 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9f9c0a00ff08bed5cbc4671fa658e1532a03715a (diff) | |
| parent | a2571fee717735aeab45821baa1af2162040407d (diff) | |
am a2571fee: (-s ours) am 215f2f83: (-s ours) am da13330d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a2571fee717735aeab45821baa1af2162040407d':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions