diff options
author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:26:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:26:05 +0000 |
commit | f643d52941be004e14b7edfe3035996475f95028 (patch) | |
tree | 0d5e1cef355097a4cbaaf803b8bf928cc91a5e79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2f6894345691af96d23952146bc3495758f84fbb (diff) | |
parent | b4600e793b4b8a4332031d08c5ba5290abe0c71d (diff) |
am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b4600e793b4b8a4332031d08c5ba5290abe0c71d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions