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