diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-13 14:42:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 14:42:44 -0800 |
| commit | 22bc9f4381e4b058124095abf50209c475c02908 (patch) | |
| tree | fc2a736116518edf3146273fbe3d209de5d97656 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 529ba10693bbb2d756b2ba6af706accdba64692a (diff) | |
| parent | dc0acc6f5d4cc8e4ed6d2a13793030350cd6262d (diff) | |
am dc0acc6f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'dc0acc6f5d4cc8e4ed6d2a13793030350cd6262d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions