diff options
author | Baligh Uddin <baligh@google.com> | 2013-11-05 08:00:15 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 08:00:15 -0800 |
commit | 79cfdb20be13e424089849a92c49516bfe785c90 (patch) | |
tree | 858179056dcb0d807d989cc404b79109db91d542 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7f4cf0daeb7fa3311a05afe23c1615cba399242c (diff) | |
parent | b8ea1228c2034ceafdd3fb1d6a25e15d2d176a69 (diff) |
am b8ea1228: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b8ea1228c2034ceafdd3fb1d6a25e15d2d176a69':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions