diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-25 22:07:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 22:07:40 +0000 |
| commit | 63cdabda89dbcfbe9caf76292003ad822c13c5d6 (patch) | |
| tree | 13a85ed3fb707002090a3a523d1d6d69bbd50cea /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 01a83089b75891d1487497e8a48521d1af161a2c (diff) | |
| parent | 33a062f209823a26fbc868801ba2250f331340f6 (diff) | |
am 33a062f2: (-s ours) am 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '33a062f209823a26fbc868801ba2250f331340f6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions