diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-23 02:08:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-23 02:08:10 +0000 |
commit | 6c8e9296c35ec88b5093d4f5553252ee0f244141 (patch) | |
tree | c93fd0ca340ee1bbce39493983d4c2af4d2cc0a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e22700ac5bda54aed59193b6f8fad838830ab0aa (diff) | |
parent | 13c48fba164a977bbf4ef64434427bab297421bf (diff) |
am 13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '13c48fba164a977bbf4ef64434427bab297421bf':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions