diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-01 07:44:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 07:44:22 -0700 |
| commit | 003ab56e84b5b4621aa3491b359a7a5f30224546 (patch) | |
| tree | 346c7e91b326ff70aa33c762e71a59f7f8b741e1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c058425f2681d9586034a9e6e3b5e8fe12a7a5bb (diff) | |
| parent | 5b76be492bcc7d0c9cc387bf3e16f29ced5ec2b2 (diff) | |
am 5b76be49: (-s ours) am c08ce101: (-s ours) am 50bdac61: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5b76be492bcc7d0c9cc387bf3e16f29ced5ec2b2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions