diff options
| author | Baligh Uddin <baligh@google.com> | 2014-01-06 16:30:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-06 16:30:30 -0800 |
| commit | be24e41b41e9ccec3bb685baf9dc951b386116ee (patch) | |
| tree | 0ddc2923cb69abb53f1137fd0d2156a76616aafb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f256f49f9fddbd035375ea8c6444cf7fa36418ca (diff) | |
| parent | 2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2 (diff) | |
am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions