diff options
| author | Baligh Uddin <baligh@google.com> | 2013-05-06 16:20:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-06 16:20:32 -0700 |
| commit | 140b9b68eed1dc7063e5ba99cfa926bd15bc50b6 (patch) | |
| tree | dddb546f65c590926b16e3ce2f0311296f29d2d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5dd3f51a19ea9992fb66f69739e616a1b98d90e5 (diff) | |
| parent | 966b340e7d18b78c74a07379bbd08a426e84d8ce (diff) | |
am 966b340e: (-s ours) am 996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '966b340e7d18b78c74a07379bbd08a426e84d8ce':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions