diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-06 17:41:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 17:41:09 +0000 |
commit | d010cf12c796cf83c760df037916e5572ce55868 (patch) | |
tree | 24942a7aef2317a2bec82bdf55f5e89552beedda /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a45bb4be2f12144754aa62a5d44c39db08b21c92 (diff) | |
parent | 221849b6d68704340754200492329f19cef7979b (diff) |
am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '221849b6d68704340754200492329f19cef7979b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions