diff options
author | Baligh Uddin <baligh@google.com> | 2014-05-06 14:54:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 14:54:27 +0000 |
commit | ddaacaa7ceb6d41658eeea0079c9882510697dac (patch) | |
tree | 426404d89843b3c55b4cfa370e8669423157074e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 867680342e12af59a26756f30cf817a131724943 (diff) | |
parent | 37c954c044b28b708528c074e7172a1bd91521eb (diff) |
am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '37c954c044b28b708528c074e7172a1bd91521eb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions