diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-11 08:30:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 08:30:06 -0700 |
| commit | a9f56df15500f6a18842325ae1ffde66e075a2e6 (patch) | |
| tree | 93c055f3b0526757d0b9db43d242bc9401126f30 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2c63cd0a1217cdc93f2a7ebbae539ebcb34be2ac (diff) | |
| parent | d2f0d91b96b3bc7d5c067065dbf9c727df93b1e2 (diff) | |
am d2f0d91b: (-s ours) am 2806e4be: (-s ours) am 38de7ab4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd2f0d91b96b3bc7d5c067065dbf9c727df93b1e2':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions