diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 13:27:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 13:27:07 -0800 |
| commit | 124f38f1179843f50db6287570eb09db633994f0 (patch) | |
| tree | 806c1d62abf844bf3758212737dfa300d193b335 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 411a26f2c42abcb533ad48ff6e6ff49a79e56dfd (diff) | |
| parent | 7f4cf0daeb7fa3311a05afe23c1615cba399242c (diff) | |
am 7f4cf0da: (-s ours) am 6a2ab888: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7f4cf0daeb7fa3311a05afe23c1615cba399242c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions