diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-23 19:29:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-23 19:29:34 -0700 |
| commit | 215f2f83f17670a954dcff48d1cf821f6e0b5df7 (patch) | |
| tree | c65a1c72ceabdf9e6cee07e41a634bd4aa50706e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1f067222c66e00de5bf2f74b69033359d918c9ff (diff) | |
| parent | da13330d9b1dc994ae2ea4e5c39b0f6ff6f87ac9 (diff) | |
am da13330d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'da13330d9b1dc994ae2ea4e5c39b0f6ff6f87ac9':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions