diff options
| author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:33:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:33:07 +0000 |
| commit | 8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8 (patch) | |
| tree | 367a3b34ee3d50c1e6e7f7ae367710199672e9ca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2ea222e6615cef6977e40b0dbb7b58c2313e6976 (diff) | |
| parent | 43ba3ba479e3779db4f260eae55ddbfbf3dc30d8 (diff) | |
am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '43ba3ba479e3779db4f260eae55ddbfbf3dc30d8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions