diff options
author | Baligh Uddin <baligh@google.com> | 2014-05-22 03:11:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 03:11:00 +0000 |
commit | b8cc0ed838c8cf303f1e8063db865651627093da (patch) | |
tree | bde4db766b585687234e96d027c8b0274b57a841 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c370f03c4ff0f6cc4da2fd663f5dc1c64d80ec7f (diff) | |
parent | 675b48712ecd0de46d6d3828890b8ca25f1df2bf (diff) |
am 675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '675b48712ecd0de46d6d3828890b8ca25f1df2bf':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions