diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-29 21:07:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-29 21:07:16 +0000 |
commit | 86af7745d337f79b37e25e21f699bf04a46838be (patch) | |
tree | b65e1adf12a7708b52810aea4c281ee429ce2fab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2e3b36a2713b7b100172f91ab019d7bd256365f1 (diff) | |
parent | c2e5503dbae833065a16fe35296e202db3887920 (diff) |
am c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'c2e5503dbae833065a16fe35296e202db3887920':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions