diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-14 16:35:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:35:56 +0000 |
| commit | 40716d95ad377a76f14a89b90319e4e9650b5963 (patch) | |
| tree | 7cafd0bacd9fc6b72b57ff896073782626409411 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 32a9180a6c1ac12503aaf0d123c2bfff73349508 (diff) | |
| parent | 634925222ad4528984bf35b9b2316db9a227d51c (diff) | |
am 63492522: (-s ours) am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '634925222ad4528984bf35b9b2316db9a227d51c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions