diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-22 03:17:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 03:17:02 +0000 |
| commit | aa587a922f215818f8c1b4d326cd769eee2e0ebd (patch) | |
| tree | b51ce37457ea5b5eae1fd57f33c6a0375ad4fe63 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3df799a048b9a88890c4072bb7a7a4469374fc06 (diff) | |
| parent | a83b42cb402cb5856e7490f5190c982a9f0575d8 (diff) | |
am a83b42cb: (-s ours) am 5938757f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'a83b42cb402cb5856e7490f5190c982a9f0575d8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions